diff --git a/src/massip-rangesv6.c b/src/massip-rangesv6.c index 74b1032a..de19e3e1 100644 --- a/src/massip-rangesv6.c +++ b/src/massip-rangesv6.c @@ -667,10 +667,10 @@ regress_pick2() } range = x.lo; for (j=0; jip_me.version != 0 && tcb->ip_them.version != 0); @@ -834,7 +833,11 @@ tcpcon_send_packet( is_warning_printed = 1; } fflush(stdout); - pixie_usleep(wait = (uint64_t)(wait *1.5)); /* no packet available */ + + /* FIXME: I'm no sure the best way to handle this. + * This would result from a bug in the code, + * but I'm not sure what should be done in response */ + pixie_usleep(100); /* no packet available */ } if (response == NULL) return; @@ -889,8 +892,7 @@ tcp_send_RST( ) { struct PacketBuffer *response = 0; - uint64_t wait = 100; - + /* Get a buffer for sending the response packet. This thread doesn't * send the packet itself. Instead, it formats a packet, then hands @@ -903,7 +905,7 @@ tcp_send_RST( is_warning_printed = 1; } fflush(stdout); - pixie_usleep(wait = (uint64_t)(wait *1.5)); /* no packet available */ + pixie_usleep(100); /* no packet available */ } if (response == NULL) return; diff --git a/src/ranges-avl.c b/src/ranges-avl.c deleted file mode 100644 index 11f0a25f..00000000 --- a/src/ranges-avl.c +++ /dev/null @@ -1,188 +0,0 @@ -/*************************************************************************** - - RANGES - AVL TREE - - Reading in a million UNSORTED IP addresses is slow, as in it could - takes hours. That's because the internal table is a linear sorted - array of entries. That means for every random IP address we add to - the list, we'll need to do a memmove() of a few megabytes of RAM. - - The solution is to first read in the IP addresses in a sort-friendly - manner, such as a binary tree. However, a normal binary tree is bad - because if the input isn't random (already sorted), then we end up - creating a linked-list instead, and are back to the same problem - of taking hours to read in all the IP addresses. - - To solve this, we first read in a file containing IP addresses into - an AVL tree. This will keep the tree balanced, preventing an unbalanced - tree. Thus, reading in a sorted and unsorted list is roughly the same - speed. - ***************************************************************************/ -#include "ranges-avl.h" -#include "util-malloc.h" -#include -#include - -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -struct RavlNode -{ - unsigned ip_begin; - unsigned ip_end; - int height; - struct RavlNode* left; - struct RavlNode* right; -}; - - -/*************************************************************************** - ***************************************************************************/ -void -ravl_free(struct RavlNode *node) -{ - if (node != NULL) { - ravl_free(node->left); - ravl_free(node->right); - free(node); - } -} - - - -/*************************************************************************** - ***************************************************************************/ -static int -height(const struct RavlNode *node) -{ - if (node == NULL) - return -1; - else - return node->height; -} - - - -/*************************************************************************** - ***************************************************************************/ -static struct RavlNode * -single_rotate_with_left(struct RavlNode* k2) -{ - struct RavlNode* k1 = NULL; - - k1 = k2->left; - k2->left = k1->right; - k1->right = k2; - - k2->height = max( height( k2->left ), height( k2->right ) ) + 1U; - k1->height = max( height( k1->left ), k2->height ) + 1U; - return k1; /* new root */ -} - - -/*************************************************************************** - ***************************************************************************/ -static struct RavlNode * -single_rotate_with_right(struct RavlNode* k1) -{ - struct RavlNode* k2; - - k2 = k1->right; - k1->right = k2->left; - k2->left = k1; - - k1->height = max( height( k1->left ), height( k1->right ) ) + 1; - k2->height = max( height( k2->right ), k1->height ) + 1; - - return k2; /* New root */ -} - - -/*************************************************************************** - ***************************************************************************/ -static struct RavlNode * -double_rotate_with_left(struct RavlNode* k3) -{ - /* Rotate between k1 and k2 */ - k3->left = single_rotate_with_right(k3->left); - - /* Rotate between K3 and k2 */ - return single_rotate_with_left(k3); -} - - -/*************************************************************************** - ***************************************************************************/ -static struct RavlNode * -double_rotate_with_right( struct RavlNode* k1 ) -{ - /* rotate between K3 and k2 */ - k1->right = single_rotate_with_left(k1->right); - - /* rotate between k1 and k2 */ - return single_rotate_with_right(k1); -} - - -/*************************************************************************** - * Recursively insert and perhaps rebalance. - ***************************************************************************/ -struct RavlNode * -ravl_insert(unsigned ip_begin, unsigned ip_end, struct RavlNode *node) -{ - if (node == NULL) { - node = MALLOC(sizeof(struct RavlNode)); - node->ip_begin = ip_begin; - node->ip_end = ip_end; - node->height = 0; - node->left = node->right = NULL; - } else if (ip_begin < node->ip_begin) { - node->left = ravl_insert(ip_begin, ip_end, node->left); - - if (height(node->left) - height(node->right) == 2) { - if (ip_begin < node->left->ip_begin) - node = single_rotate_with_left(node); - else - node = double_rotate_with_left(node); - } - } else if (ip_begin > node->ip_begin) { - node->right = ravl_insert(ip_begin, ip_end, node->right); - - if (height(node->right) - height(node->left) == 2) { - if (ip_begin > node->right->ip_begin) - node = single_rotate_with_right(node); - else - node = double_rotate_with_right(node); - } - } else { - /* ip_begin == node->ip_begin*/ - ; - } - - node->height = max( height( node->left ), height( node->right ) ) + 1; - - return node; -} - - -/*************************************************************************** - * Recursively enumerate the tree. - * This will be called to build the "rangelist_add()" function recursivley - * on all the nodes. Where this structure is a binary tree, the "rangelist" - * structure is a linear, sorted array. We'll essentially just be - * continuously appending all these nodes onto the end of the "rangelist" - * array. - ***************************************************************************/ -void -ravl_enumerate(struct RavlNode *node, RAVL_CALLBACK callback_func, void *callback_data) -{ - if (node == NULL) - return; - - callback_func(callback_data, node->ip_begin, node->ip_end); - - ravl_enumerate(node->left, callback_func, callback_data); - ravl_enumerate(node->right, callback_func, callback_data); -} - diff --git a/src/ranges-avl.h b/src/ranges-avl.h deleted file mode 100644 index cb4d6df0..00000000 --- a/src/ranges-avl.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef RANGES_AVL_H -#define RANGES_AVL_H - -struct RavlNode * -ravl_insert(unsigned ip_begin, unsigned ip_end, struct RavlNode *t); - -void -ravl_free(struct RavlNode* node); - -typedef void (*RAVL_CALLBACK)(void *callback_data, unsigned ip_begin, unsigned ip_end); - -void -ravl_enumerate(struct RavlNode *t, RAVL_CALLBACK callback_func, void *callback_data); - -#define ravl_create() (0) - - - - -#endif diff --git a/xcode4/masscan.xcodeproj/project.pbxproj b/xcode4/masscan.xcodeproj/project.pbxproj index 49781302..ff9de897 100644 --- a/xcode4/masscan.xcodeproj/project.pbxproj +++ b/xcode4/masscan.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 1106827120DF863100E612AB /* ranges-avl.c in Sources */ = {isa = PBXBuildFile; fileRef = 1106826F20DF863000E612AB /* ranges-avl.c */; }; 1107E9B2228DF7BB003384B3 /* proto-tcp-rdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1107E9B1228DF7BB003384B3 /* proto-tcp-rdp.c */; }; - 1107E9B52294DF22003384B3 /* range-file.c in Sources */ = {isa = PBXBuildFile; fileRef = 1107E9B32294DF22003384B3 /* range-file.c */; }; 110C79B022833AFA003FAC94 /* proto-oproto.c in Sources */ = {isa = PBXBuildFile; fileRef = 110C79AF22833AF9003FAC94 /* proto-oproto.c */; }; 110ED16820CB0BC200690C91 /* proto-ntlmssp.c in Sources */ = {isa = PBXBuildFile; fileRef = 110ED16720CB0BC200690C91 /* proto-ntlmssp.c */; }; 11126597197A086B00DC5987 /* out-unicornscan.c in Sources */ = {isa = PBXBuildFile; fileRef = 11126596197A086B00DC5987 /* out-unicornscan.c */; }; @@ -24,6 +22,10 @@ 115C0CAB18035BC5004E6CD7 /* proto-netbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA518035BC5004E6CD7 /* proto-netbios.c */; }; 115C0CAC18035BC5004E6CD7 /* proto-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 115C0CA718035BC5004E6CD7 /* proto-ssl.c */; }; 11623F6A191E0DB00075EEE6 /* out-certs.c in Sources */ = {isa = PBXBuildFile; fileRef = 11623F69191E0DB00075EEE6 /* out-certs.c */; }; + 118B9B3225A00FA900F5FB0B /* massip-rangesv4.c in Sources */ = {isa = PBXBuildFile; fileRef = 118B9B2B25A00FA800F5FB0B /* massip-rangesv4.c */; }; + 118B9B3325A00FA900F5FB0B /* massip-rangesv6.c in Sources */ = {isa = PBXBuildFile; fileRef = 118B9B2C25A00FA800F5FB0B /* massip-rangesv6.c */; }; + 118B9B3425A00FA900F5FB0B /* massip-parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 118B9B2F25A00FA900F5FB0B /* massip-parse.c */; }; + 118B9B3525A00FA900F5FB0B /* massip.c in Sources */ = {isa = PBXBuildFile; fileRef = 118B9B3125A00FA900F5FB0B /* massip.c */; }; 118E115225859D1300618314 /* ipv6address.c in Sources */ = {isa = PBXBuildFile; fileRef = 118E115125859D1300618314 /* ipv6address.c */; }; 118E115725859D5300618314 /* util-checksum.c in Sources */ = {isa = PBXBuildFile; fileRef = 118E115525859D5300618314 /* util-checksum.c */; }; 118E115925859E6F00618314 /* rawsock-getip6.c in Sources */ = {isa = PBXBuildFile; fileRef = 118E115825859E6F00618314 /* rawsock-getip6.c */; }; @@ -62,7 +64,6 @@ 11A921E817DBCC7E00DDFD32 /* rand-blackrock.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921B417DBCC7E00DDFD32 /* rand-blackrock.c */; }; 11A921E917DBCC7E00DDFD32 /* rand-lcg.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921B617DBCC7E00DDFD32 /* rand-lcg.c */; }; 11A921EA17DBCC7E00DDFD32 /* rand-primegen.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921B817DBCC7E00DDFD32 /* rand-primegen.c */; }; - 11A921EB17DBCC7E00DDFD32 /* ranges.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921BA17DBCC7E00DDFD32 /* ranges.c */; }; 11A921EC17DBCC7E00DDFD32 /* rawsock-arp.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921BC17DBCC7E00DDFD32 /* rawsock-arp.c */; }; 11A921ED17DBCC7E00DDFD32 /* rawsock-getif.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921BD17DBCC7E00DDFD32 /* rawsock-getif.c */; }; 11A921EE17DBCC7E00DDFD32 /* rawsock-getip.c in Sources */ = {isa = PBXBuildFile; fileRef = 11A921BE17DBCC7E00DDFD32 /* rawsock-getip.c */; }; @@ -93,7 +94,6 @@ 11B22ED718641DCC00DA5438 /* proto-x509.c in Sources */ = {isa = PBXBuildFile; fileRef = 11B22ED318641DCC00DA5438 /* proto-x509.c */; }; 11B2DD9E17DE4DD8007FC363 /* templ-payloads.c in Sources */ = {isa = PBXBuildFile; fileRef = 11B2DD9C17DE4DD8007FC363 /* templ-payloads.c */; }; 11B5897E21C0785C00DD6248 /* util-malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 11B5897D21C0785B00DD6248 /* util-malloc.c */; }; - 11B5898121C0841100DD6248 /* ranges6.c in Sources */ = {isa = PBXBuildFile; fileRef = 11B5898021C0841100DD6248 /* ranges6.c */; }; 11B6297925995AA100D4786F /* stack-queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 11B6297525995AA100D4786F /* stack-queue.c */; }; 11B6297A25995AA100D4786F /* stack-ndpv6.c in Sources */ = {isa = PBXBuildFile; fileRef = 11B6297625995AA100D4786F /* stack-ndpv6.c */; }; 11BA296218902CEE0064A759 /* out-grepable.c in Sources */ = {isa = PBXBuildFile; fileRef = 11BA295F18902CEE0064A759 /* out-grepable.c */; }; @@ -129,12 +129,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1106826F20DF863000E612AB /* ranges-avl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ranges-avl.c"; sourceTree = ""; }; - 1106827020DF863000E612AB /* ranges-avl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ranges-avl.h"; sourceTree = ""; }; 1107E9B0228DF7BB003384B3 /* proto-tcp-rdp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-tcp-rdp.h"; sourceTree = ""; }; 1107E9B1228DF7BB003384B3 /* proto-tcp-rdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-tcp-rdp.c"; sourceTree = ""; }; - 1107E9B32294DF22003384B3 /* range-file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "range-file.c"; sourceTree = ""; }; - 1107E9B42294DF22003384B3 /* range-file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "range-file.h"; sourceTree = ""; }; 110C79AE22833AF9003FAC94 /* proto-oproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-oproto.h"; sourceTree = ""; }; 110C79AF22833AF9003FAC94 /* proto-oproto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "proto-oproto.c"; sourceTree = ""; }; 110ED16520CA6A8300690C91 /* proto-spnego.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-spnego.h"; sourceTree = ""; }; @@ -166,6 +162,14 @@ 115C0CAA18035BC5004E6CD7 /* unusedparm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unusedparm.h; sourceTree = ""; }; 11623F69191E0DB00075EEE6 /* out-certs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "out-certs.c"; sourceTree = ""; }; 116806EA1995D421005B0980 /* rawsock-adapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "rawsock-adapter.h"; sourceTree = ""; }; + 118B9B2A25A00FA800F5FB0B /* massip-rangesv4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "massip-rangesv4.h"; sourceTree = ""; }; + 118B9B2B25A00FA800F5FB0B /* massip-rangesv4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "massip-rangesv4.c"; sourceTree = ""; }; + 118B9B2C25A00FA800F5FB0B /* massip-rangesv6.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "massip-rangesv6.c"; sourceTree = ""; }; + 118B9B2D25A00FA900F5FB0B /* massip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = massip.h; sourceTree = ""; }; + 118B9B2E25A00FA900F5FB0B /* massip-rangesv6.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "massip-rangesv6.h"; sourceTree = ""; }; + 118B9B2F25A00FA900F5FB0B /* massip-parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "massip-parse.c"; sourceTree = ""; }; + 118B9B3025A00FA900F5FB0B /* massip-parse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "massip-parse.h"; sourceTree = ""; }; + 118B9B3125A00FA900F5FB0B /* massip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = massip.c; sourceTree = ""; }; 118E115025859D1300618314 /* ipv6address.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipv6address.h; sourceTree = ""; }; 118E115125859D1300618314 /* ipv6address.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipv6address.c; sourceTree = ""; }; 118E115325859D2400618314 /* proto-interactive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "proto-interactive.h"; sourceTree = ""; }; @@ -239,8 +243,6 @@ 11A921B717DBCC7E00DDFD32 /* rand-lcg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "rand-lcg.h"; sourceTree = ""; }; 11A921B817DBCC7E00DDFD32 /* rand-primegen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rand-primegen.c"; sourceTree = ""; }; 11A921B917DBCC7E00DDFD32 /* rand-primegen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "rand-primegen.h"; sourceTree = ""; }; - 11A921BA17DBCC7E00DDFD32 /* ranges.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ranges.c; sourceTree = ""; }; - 11A921BB17DBCC7E00DDFD32 /* ranges.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ranges.h; sourceTree = ""; }; 11A921BC17DBCC7E00DDFD32 /* rawsock-arp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rawsock-arp.c"; sourceTree = ""; }; 11A921BD17DBCC7E00DDFD32 /* rawsock-getif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rawsock-getif.c"; sourceTree = ""; }; 11A921BE17DBCC7E00DDFD32 /* rawsock-getip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rawsock-getip.c"; sourceTree = ""; }; @@ -294,8 +296,6 @@ 11B2DD9D17DE4DD8007FC363 /* templ-payloads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "templ-payloads.h"; sourceTree = ""; }; 11B5897C21C0785B00DD6248 /* util-malloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "util-malloc.h"; sourceTree = ""; }; 11B5897D21C0785B00DD6248 /* util-malloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "util-malloc.c"; sourceTree = ""; }; - 11B5897F21C0841100DD6248 /* ranges6.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ranges6.h; sourceTree = ""; }; - 11B5898021C0841100DD6248 /* ranges6.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ranges6.c; sourceTree = ""; }; 11B6297525995AA100D4786F /* stack-queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "stack-queue.c"; sourceTree = ""; }; 11B6297625995AA100D4786F /* stack-ndpv6.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "stack-ndpv6.c"; sourceTree = ""; }; 11B6297725995AA100D4786F /* stack-queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "stack-queue.h"; sourceTree = ""; }; @@ -347,14 +347,14 @@ 112A9A0B258A89FC00D1EEBA /* massip */ = { isa = PBXGroup; children = ( - 11A921BA17DBCC7E00DDFD32 /* ranges.c */, - 11A921BB17DBCC7E00DDFD32 /* ranges.h */, - 1107E9B32294DF22003384B3 /* range-file.c */, - 1107E9B42294DF22003384B3 /* range-file.h */, - 11B5898021C0841100DD6248 /* ranges6.c */, - 11B5897F21C0841100DD6248 /* ranges6.h */, - 1106826F20DF863000E612AB /* ranges-avl.c */, - 1106827020DF863000E612AB /* ranges-avl.h */, + 118B9B2F25A00FA900F5FB0B /* massip-parse.c */, + 118B9B3025A00FA900F5FB0B /* massip-parse.h */, + 118B9B2B25A00FA800F5FB0B /* massip-rangesv4.c */, + 118B9B2A25A00FA800F5FB0B /* massip-rangesv4.h */, + 118B9B2C25A00FA800F5FB0B /* massip-rangesv6.c */, + 118B9B2E25A00FA900F5FB0B /* massip-rangesv6.h */, + 118B9B3125A00FA900F5FB0B /* massip.c */, + 118B9B2D25A00FA900F5FB0B /* massip.h */, ); name = massip; sourceTree = ""; @@ -719,6 +719,7 @@ 11B6297925995AA100D4786F /* stack-queue.c in Sources */, 11A921D517DBCC7E00DDFD32 /* event-timeout.c in Sources */, 11DD36412107E7ED00CBE1DE /* vulncheck-heartbleed.c in Sources */, + 118B9B3325A00FA900F5FB0B /* massip-rangesv6.c in Sources */, 11A921D617DBCC7E00DDFD32 /* logger.c in Sources */, 119969002141AB3600E82767 /* stub-pfring.c in Sources */, 11A921D717DBCC7E00DDFD32 /* main-conf.c in Sources */, @@ -747,14 +748,12 @@ 11A921E817DBCC7E00DDFD32 /* rand-blackrock.c in Sources */, 11A921E917DBCC7E00DDFD32 /* rand-lcg.c in Sources */, 11A921EA17DBCC7E00DDFD32 /* rand-primegen.c in Sources */, - 11A921EB17DBCC7E00DDFD32 /* ranges.c in Sources */, 11A921EC17DBCC7E00DDFD32 /* rawsock-arp.c in Sources */, 11A921ED17DBCC7E00DDFD32 /* rawsock-getif.c in Sources */, 11A921EE17DBCC7E00DDFD32 /* rawsock-getip.c in Sources */, 11A921EF17DBCC7E00DDFD32 /* rawsock-getmac.c in Sources */, 11B5897E21C0785C00DD6248 /* util-malloc.c in Sources */, 11A921F017DBCC7E00DDFD32 /* rawsock-getroute.c in Sources */, - 1106827120DF863100E612AB /* ranges-avl.c in Sources */, 11DD36492108DCBB00CBE1DE /* versioning.c in Sources */, 118E115225859D1300618314 /* ipv6address.c in Sources */, 11D0FAFB22763F4900332FA7 /* proto-coap.c in Sources */, @@ -764,7 +763,7 @@ 11DD364B2108E0CB00CBE1DE /* scripting-banner.c in Sources */, 11A921F417DBCC7E00DDFD32 /* rte-ring.c in Sources */, 11A921F517DBCC7E00DDFD32 /* smack1.c in Sources */, - 1107E9B52294DF22003384B3 /* range-file.c in Sources */, + 118B9B3225A00FA900F5FB0B /* massip-rangesv4.c in Sources */, 11A921F617DBCC7E00DDFD32 /* smackqueue.c in Sources */, 11A921F717DBCC7E00DDFD32 /* string_s.c in Sources */, 11B6297A25995AA100D4786F /* stack-ndpv6.c in Sources */, @@ -779,6 +778,7 @@ 11AC80F617E0ED47001BCE3A /* main-ptrace.c in Sources */, 119AB2062051FFED008E4DDD /* proto-memcached.c in Sources */, 11DD36462107EB8700CBE1DE /* scripting-masscan.c in Sources */, + 118B9B3525A00FA900F5FB0B /* massip.c in Sources */, 11B039C117E506B400925E7E /* main-listscan.c in Sources */, 11B039C717E7834000925E7E /* proto-dns.c in Sources */, 11B039C817E7834000925E7E /* proto-udp.c in Sources */, @@ -798,7 +798,6 @@ 11B22ED518641DCC00DA5438 /* proto-banout.c in Sources */, 11B22ED618641DCC00DA5438 /* proto-ssl-test.c in Sources */, 118E115725859D5300618314 /* util-checksum.c in Sources */, - 11B5898121C0841100DD6248 /* ranges6.c in Sources */, 11B22ED718641DCC00DA5438 /* proto-x509.c in Sources */, 11A773EB1881BFC700B135DE /* crypto-base64.c in Sources */, 11E76DB41889BC5200061F45 /* pixie-backtrace.c in Sources */, @@ -822,6 +821,7 @@ 11420DDE19A8FDE300DB5BFE /* proto-pop3.c in Sources */, 11420DE019A90CB300DB5BFE /* proto-interactive.c in Sources */, 11420DE319A9363B00DB5BFE /* proto-imap4.c in Sources */, + 118B9B3425A00FA900F5FB0B /* massip-parse.c in Sources */, 11DD36382107DE9700CBE1DE /* stub-lua.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0;