Changeset 1361

Timestamp:

08/24/07 21:42:59 (1 year ago)

Author:

till

Message:

- ... i really like inet_ntoa() ...

Files:

• honeytrap/trunk/src/dynsrv.c (modified) (2 diffs)
• honeytrap/trunk/src/ipqmon.c (modified) (2 diffs)
• honeytrap/trunk/src/nfqmon.c (modified) (2 diffs)
• honeytrap/trunk/src/pcapmon.c (modified) (2 diffs)

honeytrap/trunk/src/dynsrv.c

@@ -116 +116 @@
-                                port_mode = port_flags_udp[htons(port_l)]->mode;
-                }
-
-                ip_l_str = strdup(inet_ntoa(ip_l));
-                ip_r_str = strdup(inet_ntoa(ip_r));
-
-#ifndef USE_IPQ_MON
@@ -195 +192 @@
-                                if (FD_ISSET(sigpipe[0], &rfds) && (check_sigpipe() == -1)) exit(EXIT_FAILURE);
-                                if (FD_ISSET(listen_fd, &rfds)) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                        /* initialize attack record */

honeytrap/trunk/src/ipqmon.c

@@ -42 +42 @@
-        fd_set                  rfds;
-        struct timeval          mainloop_timeout;
+        char                    *srcip, *dstip;
-        unsigned char           buf[BUFSIZE];
-        struct ip_header        *ip;
@@ -128 +129 @@
-
-                                        /* Got a connection request, start dynamic server and pass packet processing back to the kernel */
+                                        if ((srcip = strdup(inet_ntoa(ip->ip_src))) == NULL) {
+                                                logmsg(LOG_ERR, 1, "Error - Unable to allocate memory: %m.\n");
+                                                exit(EXIT_FAILURE);
+                                        }
+                                        if ((dstip = strdup(inet_ntoa(ip->ip_dst))) == NULL) {
+                                                logmsg(LOG_ERR, 1, "Error - Unable to allocate memory: %m.\n");
+                                                exit(EXIT_FAILURE);
+                                        }
-                                        logmsg(LOG_NOISY, 1, "%s:%d requesting %s connection on %s:%d.\n",
-
+
+
+
+
-                                        switch (port_mode) {
-                                        case PORTCONF_NONE:

honeytrap/trunk/src/nfqmon.c

@@ -84 +84 @@
-        }
-
+        if ((srcip = strdup(inet_ntoa(ip->ip_src))) == NULL) {
+                logmsg(LOG_ERR, 1, "Error - Unable to allocate memory: %m.\n");
+                exit(EXIT_FAILURE);
+        }
+        if ((dstip = strdup(inet_ntoa(ip->ip_dst))) == NULL) {
+                logmsg(LOG_ERR, 1, "Error - Unable to allocate memory: %m.\n");
+                exit(EXIT_FAILURE);
+        }
-        logmsg(LOG_NOISY, 1, "%s:%d requesting %s connection on %s:%d.\n",
-
+
+
+
+
-        switch (port_mode) {
-        case PORTCONF_NONE:
@@ -125 +136 @@
-        }
-
-        if ((srcip = strdup(inet_ntoa(ip->ip_src))) == NULL) {
-                logmsg(LOG_ERR, 1, "Error - Unable to allocate memory: %m.\n");
-                exit(EXIT_FAILURE);
-        }
-        if ((dstip = strdup(inet_ntoa(ip->ip_dst))) == NULL) {
-                logmsg(LOG_ERR, 1, "Error - Unable to allocate memory: %m.\n");
-                exit(EXIT_FAILURE);
-        }
-        start_dynamic_server(ip->ip_src, htons(sport), ip->ip_dst, htons(dport), ip->ip_p);
-        

honeytrap/trunk/src/pcapmon.c

@@ -71 +71 @@
-        uint16_t        sport, dport;
-        u_int8_t        port_mode;
+        char            *srcip, *dstip;
-
-        sport           = 0;
@@ -93 +94 @@
-        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        switch (port_mode) {
-        case PORTCONF_NONE: