Changeset 1120

Timestamp:

01/24/07 23:51:38 (2 years ago)

Author:

honeytrap

Message:

fixes for some type casts

Files:

• honeytrap/trunk/src/attack.c (modified) (3 diffs)
• honeytrap/trunk/src/modules/htm_ftpDownload.c (modified) (3 diffs)
• honeytrap/trunk/src/modules/htm_ftpDownload.h (modified) (1 diff)
• honeytrap/trunk/src/proxy.c (modified) (2 diffs)

honeytrap/trunk/src/attack.c

@@ -41 +41 @@
-
-        /* store attack connection data in attack record */
-a->a_conn.l_addr       = l_addr
-a->a_conn.r_addr       = r_addr
+memcpy(&(a->a_conn.l_addr), &l_addr, sizeof(uint32_t))
+memcpy(&(a->a_conn.r_addr), &r_addr, sizeof(uint32_t))
-        a->a_conn.l_port        = l_port;
-        a->a_conn.r_port        = r_port;
@@ -55 +55 @@
-/* process attack - call plugins registered for hook 'process_attack' */
-int process_data(u_char *a_data, uint32_t a_size, u_char *p_data, uint32_t p_size, uint16_t port, Attack *a) {
+        struct in_addr *addr = NULL;
-
-        if (a == NULL) {
@@ -84 +85 @@
-
-        if (!a_size) {
+                addr = (struct in_addr *) &(a->a_conn.r_addr);
-                logmsg(LOG_NOTICE, 1, " * %u\t  No bytes received from %s:%u.\n",
-a->a_conn.r_
+*
-        } else {
+                addr = (struct in_addr *) &(a->a_conn.r_addr);
-                logmsg(LOG_NOTICE, 1, " * %u\t  %d bytes attack string from %s:%u.\n",
-a->a_conn.r_
+*
-        }
-

honeytrap/trunk/src/modules/htm_ftpDownload.c

@@ -55 +55 @@
-        int i=0;
-        char *string_for_processing;
+        struct in_addr *addr = NULL;
-
-        logmsg(LOG_DEBUG, 1, "Parsing attack string (%d bytes) for ftp commands.\n", attack->a_conn.payload.size);
@@ -68 +69 @@
-
-                        /* do ftp download */
-
+
+
-                }
-        }
@@ -75 +77 @@
-}
-
-in
+uint32_
-        char *parse_string=NULL, port[6], *user=NULL, *pass=NULL, *file=NULL;
-        struct hostent *host=NULL;

honeytrap/trunk/src/modules/htm_ftpDownload.h

@@ -28 +28 @@
-int ftp_quit(int control_sock_fd, int data_sock_fd, int dumpfile_fd);
-int get_ftp_ressource(const char *user, const char* pass, struct in_addr *lhost, struct in_addr *rhost, const int port, const char *save_file);
-in
+uint32_
-
-#endif

honeytrap/trunk/src/proxy.c

@@ -158 +158 @@
-                                return(-1);
-                        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                }
-                        }
-fprintf(stdout, "---> connected.\n");
-        }
-                }
-                
@@ -178 +177 @@
-                        return(-1);
-                }
-attack->p_conn.l_addr  = local_socket.sin_addr; 
-attack->p_conn.r_addr  = proxy_socket.sin_addr
+memcpy(&(attack->p_conn.l_addr), &local_socket.sin_addr, sizeof(uint32_t));
+memcpy(&(attack->p_conn.r_addr), &proxy_socket.sin_addr, sizeof(uint32_t))
-                attack->p_conn.l_port   = local_socket.sin_port;
-                attack->p_conn.r_port   = proxy_socket.sin_port;
-        }
-//fprintf(stdout, "---> writing test pattern.\n");
-//write(proxy_sock_fd, "back\n", 5);
-//fprintf(stdout, "---> done.\n");
-        return(proxy_sock_fd);
-}