Changeset 1600

Timestamp:

03/12/08 20:09:48 (7 months ago)

Author:

till

Message:

honeytrap
- minor cosmetic changes
- edit distance tool corrected

Files:

• honeytrap/trunk/src/modules/htm_submitMWserv.c (modified) (15 diffs)
• honeytrap/trunk/src/modules/htm_submitNebula.c (modified) (1 diff)
• honeytrap/trunk/src/sock.c (modified) (3 diffs)
• honeytrap/trunk/tools/edist.c (modified) (2 diffs)

honeytrap/trunk/src/modules/htm_submitMWserv.c

@@ -170 +170 @@
-        
-        if ((((bstr *)response)->data = realloc(((bstr *)response)->data, ((((bstr *)response)->len + n) * s))) == NULL) {
-S
+s
-                return(0);
-        }
@@ -190 +190 @@
-        switch(response_code(response)) {
-        case TSS_OK:
-S
+s
-                return(TSS_OK);
-        case TSS_UNKNOWN:
-S
+s
-                return(TSS_UNKNOWN);
-        default:
@@ -202 +202 @@
-                        buf[response->len] = 0;
-                        
-S
+s
-                        return TSS_ERROR;
-                }
@@ -222 +222 @@
-                max_fd = 0;
-                if ((error = curl_multi_fdset(mhandle, &rfds, &wfds, &efds, &max_fd))) {
-S
+s
-                        return(0);
-                }
@@ -231 +231 @@
-                select_timeout.tv_usec  = 0;
-                
-S
+s
-
-                switch (rv = select(max_fd+1, &rfds, &wfds, &efds, &select_timeout)) {
-                case -1:
-                        if (errno != EINTR) {
-S
+s
-                                return(-1);
-                        }
@@ -243 +243 @@
-                
-                        if (FD_ISSET(sigpipe[0], &rfds) && (check_sigpipe() == -1)) {
-S
+s
-                                exit(EXIT_FAILURE);
-                        }
-
-                        handles = 0;
-S
+s
-                        
-                        
@@ -265 +265 @@
-                                                if(message->data.result)
-                                                {
-S
+s
-                                                        return TSS_ERROR;
-                                                }
@@ -298 +298 @@
-        memset(dport, 0, 6);
-
-S
+s
-        if (!(*curlhandle = curl_easy_init()) || !(*multihandle = curl_multi_init())) {
-                logmsg(LOG_ERR, 1, "SubmitMWserv - Unable to create easy hanlde.\n");
@@ -305 +305 @@
-        
-                
-S
+s
-        
-        if (guid)
@@ -358 +358 @@
-        curl_easy_setopt(*curlhandle, CURLOPT_TIMEOUT, timeout);
-
-S
+s
-        CURLMcode error;
-        if ((error = curl_multi_add_handle(*multihandle, *curlhandle))) {
-S
+s
-                curl_easy_cleanup(*curlhandle);
-                return(NULL);
@@ -395 +395 @@
-
-                // test hash
-S
+s
-                memset(&response, 0, sizeof(bstr));
-
-                if (build_uri(&uri, attack->download[i]) == -1) {
-S
+s
-                        return(0);
-                }
@@ -412 +412 @@
-                {
-                case TSS_OK:
-S
+s
-                        free(response.data);
-                        
@@ -418 +418 @@
-                
-                case TSS_ERROR:
-S
+s
-                        free(response.data);
-                        
@@ -428 +428 @@
-
-                // submit sample
-S
+s
-
-                memset(&response, 0, sizeof(bstr));
@@ -440 +440 @@
-
-                if (transfer_data(multihandle, &response) == TSS_OK)
-S
+s
-                else
-S
+s
-
-                free(uri);

honeytrap/trunk/src/modules/htm_submitNebula.c

@@ -160 +160 @@
-        }
-
-
+n
-        if ((inner = realloc(inner, HMAC_HASH_SIZE+HMAC_BLOCK_SIZE)) == NULL) {
-                logmsg(LOG_ERR, 1, "SubmitNebula Error - Unable to allocate memory: %m.\n");

honeytrap/trunk/src/sock.c

@@ -111 +111 @@
-        socklen_t       len;
-
+        flags            = 0;
+
-        /* safe fd flags and set socket to non-blocking */
-        if ((flags = fcntl(sock_fd, F_GETFL, 0) < 0)) return(-1);
@@ -116 +118 @@
-        
-        /* try an immediate connect */
-
+
+
-        if ((rv = connect(sock_fd, sockaddr, slen)) < 0) 
-                if (errno != EINPROGRESS) return(-1);
@@ -151 +154 @@
-                        }
-                        if (FD_ISSET(sock_fd, &rfds) || FD_ISSET(sock_fd, &wfds)) {
- 
+    
-                                if (getsockopt(sock_fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) return(-1);
-                                if (error) {

honeytrap/trunk/tools/edist.c

@@ -112 +112 @@
-        struct bstr bstr1, bstr2;
-        u_int32_t dist;
-float eq
+double eq, ed
-
-        if (argc < 3) printf("usage: %s file1 file2\n", argv[0]);
@@ -119 +119 @@
-                bstr2   = file2string(argv[2]);
-
+                // special cases: at least one input is empty
+                if (!bstr1.len && !bstr2.len) { 
+                        printf("Similarity: 100%% (edit distance: 0).\n");
+                        return(EXIT_SUCCESS);
+                }
+                if (!bstr1.len || !bstr2.len) { 
+                        printf("Similarity: 0%% (edit distance: %u).\n", abs(bstr1.len-bstr2.len));
+                        return(EXIT_SUCCESS);
+                }
+
-                dist    = edit_dist(bstr1, bstr2);
-
-
+
+
+
+
-
-                printf("Similarity: %.2f%% (edit distance: %u).\n", eq, dist);
-        }
-0
+EXIT_SUCCESS
-}