X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fiface-windows.c;h=9a57f7c2b7f8eda2268e7b740abb0fff17e3e841;hb=63d3e3348dcd2178196634ede35b23ffe3a2c50a;hp=b2b96a15e77087e1ea128be196e06bb0a584fc56;hpb=59e603d00947dfa0ee068c6ec15742fa75c44a27;p=catta

diff --git a/src/iface-windows.c b/src/iface-windows.c
index b2b96a1..9a57f7c 100644
--- a/src/iface-windows.c
+++ b/src/iface-windows.c
@@ -103,17 +103,6 @@ static void ip_adapter_unicast_address(CattaInterfaceMonitor *m,
     }
 
     set_global_scope_flag(ifaddr, &addr);
-
-    // XXX debugging, remove
-    {
-        char s[CATTA_ADDRESS_STR_MAX];
-        catta_log_debug(" address: %s\n"
-                        "   global_scope: %d\n"
-                        "   flags: 0x%.4x",
-            catta_address_snprint(s, sizeof(s), &addr),
-            ifaddr->global_scope,
-            (unsigned int)a->Flags);
-    }
 }
 
 // integrate the information from an IP_ADAPTER_ADDRESSES structure
@@ -173,36 +162,10 @@ static void ip_adapter(CattaInterfaceMonitor *m, IP_ADAPTER_ADDRESSES *p)
         hw->mac_address_size = CATTA_MAC_ADDRESS_MAX;
     memcpy(hw->mac_address, p->PhysicalAddress, hw->mac_address_size);
 
-    // XXX debugging, remove
-    {
-        char mac[256];
-        catta_log_debug(" name: %s\n"
-                        " index: %d\n"
-                        "   IfIndex: %u\n"
-                        "   Ipv6IfIndex: %u\n"
-                        " mtu: %d\n"
-                        " mac: %s\n"
-                        " flags_ok: %d\n"
-                        "   type: %u\n"
-                        "   status: %u\n"
-                        "   multicast: %d\n"
-                        "   flags: 0x%.4x",
-            hw->name, hw->index,
-            (unsigned int)p->IfIndex, (unsigned int)p->Ipv6IfIndex,
-            hw->mtu,
-            catta_format_mac_address(mac, sizeof(mac), hw->mac_address, hw->mac_address_size),
-            hw->flags_ok,
-            (unsigned int)p->IfType,
-            (unsigned int)p->OperStatus,
-            !(p->Flags & IP_ADAPTER_NO_MULTICAST),
-            (unsigned int)p->Flags);
-    }
-
     // process addresses
     // XXX remove addresses that are no longer in the list
     for(a=p->FirstUnicastAddress; a; a=a->Next)
         ip_adapter_unicast_address(m, hw, a);
-    catta_log_debug("=====");
 }
 
 
@@ -297,27 +260,6 @@ static void update_hw_interface(CattaHwInterface *hw)
         hw->mac_address_size = CATTA_MAC_ADDRESS_MAX;
     memcpy(hw->mac_address, row.PhysicalAddress, hw->mac_address_size);
 
-    // XXX debugging, remove
-    {
-        char mac[256];
-        catta_log_debug(" name: %s\n"
-                        " mtu: %d\n"
-                        " mac: %s\n"
-                        " flags_ok: %d\n"
-                        "   type: %u\n"
-                        "   status: %u\n"
-                        "   multicast: %d\n"
-                        "   access type: %d",
-            hw->name,
-            hw->mtu,
-            catta_format_mac_address(mac, sizeof(mac), hw->mac_address, hw->mac_address_size),
-            hw->flags_ok,
-            (unsigned int)row.Type,
-            (unsigned int)row.OperStatus,
-            multicast,
-            (int)row.AccessType);
-    }
-
     catta_hw_interface_check_relevant(hw);
     catta_hw_interface_update_rrs(hw, 0);
 }
@@ -330,20 +272,6 @@ static void handle_iface_event(CattaInterfaceMonitor *m, MIB_IPINTERFACE_ROW *ro
     CattaInterface *iface;
     CattaHwInterface *hw;
 
-    // XXX debug, remove
-    {
-        const char *typestr = NULL;
-
-        switch(type) {
-            case MibParameterNotification:  typestr = "ParameterNotification"; break;
-            case MibAddInstance:            typestr = "AddInstance"; break;
-            case MibDeleteInstance:         typestr = "DeleteInstance"; break;
-            default:                        typestr = "Unknown";
-        }
-
-        catta_log_debug("interface %s on iface %d for %s", typestr, idx, protostr);
-    }
-
     // see if we know this interface
     iface = catta_interface_monitor_get_interface(m, idx, proto);
     hw = iface ? iface->hardware : catta_interface_monitor_get_hw_interface(m, idx);
@@ -419,24 +347,6 @@ static void handle_addr_event(CattaInterfaceMonitor *m, MIB_UNICASTIPADDRESS_ROW
     addr.proto = catta_af_to_proto(row->Address.si_family);
     protostr = catta_proto_to_string(addr.proto);
 
-    // XXX debug, remove
-    {
-        const char *typestr = NULL;
-        char buf[CATTA_ADDRESS_STR_MAX];
-
-        switch(type) {
-            case MibParameterNotification:  typestr = "ParameterNotification"; break;
-            case MibAddInstance:            typestr = "AddInstance"; break;
-            case MibDeleteInstance:         typestr = "DeleteInstance"; break;
-            default:                        typestr = "Unknown";
-        }
-
-        catta_log_debug("%s for %s address %s on iface %d",
-                        typestr, protostr,
-                        catta_address_snprint(buf, sizeof(buf), &addr),
-                        idx);
-    }
-
     // see if we know this address/interface
     iface = catta_interface_monitor_get_interface(m, idx, addr.proto);
     ifaddr = iface ? catta_interface_monitor_get_address(m, iface, &addr) : NULL;
@@ -492,7 +402,6 @@ static void handle_addr_event(CattaInterfaceMonitor *m, MIB_UNICASTIPADDRESS_ROW
         assert(ifaddr != NULL);
 
         set_global_scope_flag(ifaddr, &addr);
-        catta_log_debug("   global_scope: %d", ifaddr->global_scope); // XXX debugging, remove
         break;
     case MibDeleteInstance:
         if(ifaddr)