Changeset 1271

Timestamp:

05/21/07 10:24:47 (1 year ago)

Author:

till

Message:

missing close(socket) added and nfq_set_verdict() return value checks

Files:

• honeytrap/trunk/src/conftree.c (modified) (2 diffs)
• honeytrap/trunk/src/dynsrv.c (modified) (1 diff)
• honeytrap/trunk/src/nfqmon.c (modified) (2 diffs)
• honeytrap/trunk/src/tcp.c (modified) (2 diffs)

honeytrap/trunk/src/conftree.c

@@ -198 +198 @@
-                                if ((cur_node = check_keyword(*tree, key)) == NULL)
-                                        if ((cur_node = add_keyword(tree, key, NULL, 0)) == NULL) return(NULL);
-//printf(" -- got a list entry: %s:%s = %s\n", key, subkey, (char *) data);
-                                if (add_list_item(cur_node, data, size) == NULL) {
-                                        fprintf(stderr, "  Error - Unable to add list item for %s.\n", key);
@@ -225 +224 @@
-
-        if (size) {
-//printf(" -- got single list entry: %s = %s\n", keyword, (char *) data);
-                if (add_list_item(new_node, data, size) == NULL) {
-                        fprintf(stderr, "  Error - Unable to add list item for %s.\n", keyword);

honeytrap/trunk/src/dynsrv.c

@@ -177 +177 @@
-            case  0:
-                /* timeout */
+                close(listen_fd);
-                logmsg(LOG_NOISY, 1, "-> %u\t  No incoming connection for %u seconds - server terminated.\n",
-                    (uint16_t) ntohs(port_l), conn_timeout);

honeytrap/trunk/src/nfqmon.c

@@ -80 +80 @@
-                if (nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL) != 0) {
-                        logmsg(LOG_ERR, 1, "Error - Could not set verdict on packet.\n");
+                        nfq_destroy_queue(qh);
-                        exit(EXIT_FAILURE);
-                }
+                logmsg(LOG_DEBUG, 1, "IPQ - Successfully set verdict on packet.\n");
-                return(0);
-        case PORTCONF_NORMAL:
@@ -96 +98 @@
-                if (nfq_set_verdict(qh, id, NF_ACCEPT, 0, NULL) != 0) {
-                        logmsg(LOG_ERR, 1, "Error - Could not set verdict on packet.\n");
+                        nfq_destroy_queue(qh);
-                        exit(EXIT_FAILURE);
-                }
+                logmsg(LOG_DEBUG, 1, "IPQ - Successfully set verdict on packet.\n");
-                return(0);
-        }

honeytrap/trunk/src/tcp.c

@@ -57 +57 @@
-        server_addr->sin_port           = port;
-        if ((bind(fd, (struct sockaddr *) server_addr, sizeof(struct sockaddr_in))) < 0) {
-
+
+
-#ifdef USE_IPQ_MON
-            /* hand packet processing back to the kernel */
@@ -66 +67 @@
-                exit(EXIT_FAILURE);
-            }
+            logmsg(LOG_DEBUG, 1, "IPQ - Successfully set verdict on packet.\n");
-            return(-1);
-#else
-#ifdef USE_NFQ_MON
-            /* hand packet processing back to the kernel */
-
+
+
+
+
+
+
-            return(-1);
-#else