Changeset 1801

Timestamp:

04/14/07 15:08:33 (21 months ago)

Author:

aturner

Message:

work around HP/UX. refs #141

Location:

trunk/src

Files:

• defines.h.in (modified) (2 diffs)
• tcpprep.c (modified) (3 diffs)
• tcpprep_opts.def (modified) (1 diff)
• tree.c (modified) (19 diffs)

trunk/src/defines.h.in

@@ -116 +116 @@
 #define PCAP_TIMEOUT 100        /* 100ms pcap_open_live timeout */
 
+/* HP-UX already defines TRUE/FALSE */
+#ifndef TRUE
 enum bool_t {
         FALSE = 0,
         TRUE
 };
+#endif
 
 #define EBUF_SIZE 1024           /* size of our error buffers */
@@ -132 +135 @@
 
 enum direction_t {
-        UNKNOWN = -1,
-        CLIENT = 0,
-        SERVER = 1,
-        ANY = 2
+        DIR_UNKNOWN = -1,
+        DIR_CLIENT = 0,
+        DIR_SERVER = 1,
+        DIR_ANY = 2
 };
 

trunk/src/tcpprep.c

@@ -398 +398 @@
             dbg(2, "processing second pass of auto: bridge mode...");
             cache_result = add_cache(&options.cachedata, SEND,
-                      check_ip_tree(UNKNOWN, ip_hdr->ip_src.s_addr));
+                      check_ip_tree(DIR_UNKNOWN, ip_hdr->ip_src.s_addr));
             break;
         case SERVER_MODE:
@@ -407 +407 @@
             dbg(2, "processing second pass of auto: server mode...");
             cache_result = add_cache(&options.cachedata, SEND,
-                      check_ip_tree(SERVER, ip_hdr->ip_src.s_addr));
+                      check_ip_tree(DIR_SERVER, ip_hdr->ip_src.s_addr));
             break;
         case CLIENT_MODE:
@@ -416 +416 @@
             dbg(2, "processing second pass of auto: client mode...");
             cache_result = add_cache(&options.cachedata, SEND,
-                      check_ip_tree(CLIENT, ip_hdr->ip_src.s_addr));
+                      check_ip_tree(DIR_CLIENT, ip_hdr->ip_src.s_addr));
             break;
         case PORT_MODE:

trunk/src/tcpprep_opts.def

@@ -432 +432 @@
     flag-code   = <<- EONonip
  
-    options.nonip = SERVER;
+    options.nonip = DIR_SERVER;
     
 EONonip;

trunk/src/tree.c

@@ -79 +79 @@
 
         /* we only check types that are vaild */
-        if (bcdata->type != ANY)    /* don't check if we're adding ANY */
+        if (bcdata->type != DIR_ANY)    /* don't check if we're adding ANY */
             if (bcdata->type != node->type) /* no match, exit early */
                 return;
@@ -116 +116 @@
 
         /* we only check types that are vaild */
-        if (bcdata->type != ANY)    /* don't check if we're adding ANY */
+        if (bcdata->type != DIR_ANY)    /* don't check if we're adding ANY */
             if (bcdata->type != node->type) /* no match, exit early */
                 return 0;
@@ -153 +153 @@
 
         /* set starting vals */
-        bcdata->type = SERVER;
+        bcdata->type = DIR_SERVER;
         bcdata->masklen = mymask;
 
@@ -163 +163 @@
 
         /* try to find clients in cidrdata */
-        bcdata->type = CLIENT;
+        bcdata->type = DIR_CLIENT;
 
         if (! tree_checkincidr(&treeroot, bcdata)) { /* didn't find any clients in cidrdata */
@@ -208 +208 @@
     node = RB_FIND(tcpr_data_tree_s, &treeroot, finder);
 
-    if (node == NULL && mode == UNKNOWN)
+    if (node == NULL && mode == DIR_UNKNOWN)
         errx(1, "%s (%lu) is an unknown system... aborting.!\n"
              "Try a different auto mode (-n router|client|server)",
@@ -214 +214 @@
 
 #ifdef DEBUG
-    if (node->type == SERVER) {
+    if (node->type == DIR_SERVER) {
         dbgx(1, "Server: %s", get_addr2name4(ip, RESOLVE));
     }
-    else if (node->type == CLIENT) {
+    else if (node->type == DIR_CLIENT) {
         dbgx(1, "Client: %s", get_addr2name4(ip, RESOLVE));
     }
@@ -231 +231 @@
     /* return node type if we found the node, else return the default (mode) */
     if (node != NULL) {
-        if (node->type == SERVER) {
+        if (node->type == DIR_SERVER) {
             return TCPR_DIR_C2S;
-        } else if (node->type == CLIENT) {
+        } else if (node->type == DIR_CLIENT) {
             return TCPR_DIR_S2C;
         }
     }
     else {
-        if (mode == SERVER) {
+        if (mode == DIR_SERVER) {
             return TCPR_DIR_C2S;
-        } else if (mode == CLIENT) {
+        } else if (mode == DIR_CLIENT) {
             return TCPR_DIR_S2C;
         }
@@ -261 +261 @@
     assert(ip == newnode->ip);
 
-    if (newnode->type == UNKNOWN) {
+    if (newnode->type == DIR_UNKNOWN) {
         /* couldn't figure out if packet was client or server */
 
@@ -276 +276 @@
     if (node == NULL) {
         /* increment counters */
-        if (newnode->type == SERVER) {
+        if (newnode->type == DIR_SERVER) {
             newnode->server_cnt++;
         }
-        else if (newnode->type == CLIENT) {
+        else if (newnode->type == DIR_CLIENT) {
             newnode->client_cnt++;
         }
@@ -291 +291 @@
         dbgx(3, "%s", tree_printnode("update node", node));
         /* increment counter */
-        if (newnode->type == SERVER) {
+        if (newnode->type == DIR_SERVER) {
             node->server_cnt++;
         }
-        else if (newnode->type == CLIENT) {
+        else if (newnode->type == DIR_CLIENT) {
             /* temp debug code */
             node->client_cnt++;
@@ -323 +323 @@
             /* type based on: server >= (client*ratio) */
             if ((double)node->server_cnt >= (double)node->client_cnt * options.ratio) {
-                node->type = SERVER;
+                node->type = DIR_SERVER;
                 dbgx(3, "Setting %s to server", 
                         get_addr2name4(node->ip, RESOLVE));
             }
             else {
-                node->type = CLIENT;
+                node->type = DIR_CLIENT;
                 dbgx(3, "Setting %s to client", 
                         get_addr2name4(node->ip, RESOLVE));
@@ -334 +334 @@
         }
         else {                  /* IP had no client or server connections */
-            node->type = UNKNOWN;
+            node->type = DIR_UNKNOWN;
             dbgx(3, "Setting %s to unknown", 
                     get_addr2name4(node->ip, RESOLVE));
@@ -386 +386 @@
     node->server_cnt = 0;
     node->client_cnt = 0;
-    node->type = UNKNOWN;
+    node->type = DIR_UNKNOWN;
     node->masklen = -1;
     node->ip = 0;
@@ -443 +443 @@
         /* set TREE->type based on TCP flags */
         if (tcp_hdr.th_flags == TH_SYN) {
-            node->type = CLIENT;
+            node->type = DIR_CLIENT;
             dbg(3, "is a client");
         }
         else if (tcp_hdr.th_flags == (TH_SYN | TH_ACK)) {
-            node->type = SERVER;
+            node->type = DIR_SERVER;
             dbg(3, "is a server");
         }
@@ -474 +474 @@
             if (dnsv4_hdr.flags & DNS_QUERY_FLAG) {
                 /* bit set, response */
-                node->type = SERVER;
+                node->type = DIR_SERVER;
 
                 dbg(3, "is a dns server");
@@ -481 +481 @@
             else {
                 /* bit not set, query */
-                node->type = CLIENT;
+                node->type = DIR_CLIENT;
 
                 dbg(3, "is a dns client");
@@ -500 +500 @@
             if ((dnsv4_hdr.flags & 0x7FFFF) ^ DNS_QUERY_FLAG) {
                 /* bit set, response */
-                node->type = SERVER;
+                node->type = DIR_SERVER;
                 dbg(3, "is a dns server");
             }
             else {
                 /* bit not set, query */
-                node->type = CLIENT;
+                node->type = DIR_CLIENT;
                 dbg(3, "is a dns client");
             }
@@ -535 +535 @@
         if ((icmp_hdr.icmp_type == ICMP_UNREACH) &&
             (icmp_hdr.icmp_code == ICMP_UNREACH_PORT)) {
-            node->type = SERVER;
+            node->type = DIR_SERVER;
             dbg(3, "is a server with a closed port");
         }
@@ -564 +564 @@
                 name, (void *)node, get_addr2name4(node->ip, RESOLVE),
                 node->masklen, node->server_cnt, node->client_cnt);
-        if (node->type == SERVER) {
+        if (node->type == DIR_SERVER) {
             strlcat(tree_print_buff, "Type: Server\n--\n", TREEPRINTBUFFLEN);
         }