Don't print interface network name if there's no network structure

diff --git a/bpf.c b/bpf.c
index 7e3f6610616cdb0922d1d97c927b720c1685edb6..dd773f3803d2690030e08e62b6ffe107d63fe5e7 100644 (file)
--- a/bpf.c
+++ b/bpf.c
@@ -115,7 +115,8 @@ void if_register_send (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_BPF_SEND */
 
@@ -213,7 +214,8 @@ void if_register_receive (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_BPF_RECEIVE */
 

diff --git a/common/bpf.c b/common/bpf.c
index 7e3f6610616cdb0922d1d97c927b720c1685edb6..dd773f3803d2690030e08e62b6ffe107d63fe5e7 100644 (file)
--- a/common/bpf.c
+++ b/common/bpf.c
@@ -115,7 +115,8 @@ void if_register_send (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_BPF_SEND */
 
@@ -213,7 +214,8 @@ void if_register_receive (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_BPF_RECEIVE */
 

diff --git a/common/nit.c b/common/nit.c
index a237a81b43686bf168689300338783c3d479e9d9..7937b60ac3eca277a92737392c39c6fbf22f69e7 100644 (file)
--- a/common/nit.c
+++ b/common/nit.c
@@ -137,7 +137,8 @@ void if_register_send (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_NIT_SEND */
 
@@ -222,7 +223,8 @@ void if_register_receive (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_NIT_RECEIVE */
 

diff --git a/common/raw.c b/common/raw.c
index 39b4a93afca280f2d6fec6ee35daa4475d2b1312..36a0d5e25769ebc39cf70b1be720e1e56d977e31 100644 (file)
--- a/common/raw.c
+++ b/common/raw.c
@@ -96,7 +96,9 @@ void if_register_send (info, interface)
 
        info -> wfdesc = sock;
        note ("Sending on   Raw/%s/%s",
-             info -> name, info -> shared_network -> name);
+             info -> name,
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 
 size_t send_packet (interface, packet, raw, len, from, to, hto)

diff --git a/common/socket.c b/common/socket.c
index 12c72d958d011abfa780d047dd53474c02d706ee..bb4475279a05c5b19a1db2c0cee093fbbebc717f 100644 (file)
--- a/common/socket.c
+++ b/common/socket.c
@@ -132,7 +132,9 @@ void if_register_send (info, interface)
        info -> wfdesc = info -> rfdesc;
 #endif
        note ("Sending on   Socket/%s/%s",
-             info -> name, info -> shared_network -> name);
+             info -> name,
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 
 }
 #endif /* USE_SOCKET_SEND */
@@ -145,7 +147,10 @@ void if_register_receive (info, interface)
        /* If we're using the socket API for sending and receiving,
           we don't need to register this interface twice. */
        info -> rfdesc = if_register_socket (info, interface);
-       note ("Listening on Socket/%s", piaddr (info -> address));
+       note ("Listening on Socket/%s/%s",
+             info -> name,
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_SOCKET_RECEIVE */
 

diff --git a/nit.c b/nit.c
index a237a81b43686bf168689300338783c3d479e9d9..7937b60ac3eca277a92737392c39c6fbf22f69e7 100644 (file)
--- a/nit.c
+++ b/nit.c
@@ -137,7 +137,8 @@ void if_register_send (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_NIT_SEND */
 
@@ -222,7 +223,8 @@ void if_register_receive (info, interface)
              print_hw_addr (info -> hw_address.htype,
                             info -> hw_address.hlen,
                             info -> hw_address.haddr),
-             info -> shared_network -> name);
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_NIT_RECEIVE */
 

diff --git a/raw.c b/raw.c
index 39b4a93afca280f2d6fec6ee35daa4475d2b1312..36a0d5e25769ebc39cf70b1be720e1e56d977e31 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -96,7 +96,9 @@ void if_register_send (info, interface)
 
        info -> wfdesc = sock;
        note ("Sending on   Raw/%s/%s",
-             info -> name, info -> shared_network -> name);
+             info -> name,
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 
 size_t send_packet (interface, packet, raw, len, from, to, hto)

diff --git a/socket.c b/socket.c
index 12c72d958d011abfa780d047dd53474c02d706ee..bb4475279a05c5b19a1db2c0cee093fbbebc717f 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -132,7 +132,9 @@ void if_register_send (info, interface)
        info -> wfdesc = info -> rfdesc;
 #endif
        note ("Sending on   Socket/%s/%s",
-             info -> name, info -> shared_network -> name);
+             info -> name,
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 
 }
 #endif /* USE_SOCKET_SEND */
@@ -145,7 +147,10 @@ void if_register_receive (info, interface)
        /* If we're using the socket API for sending and receiving,
           we don't need to register this interface twice. */
        info -> rfdesc = if_register_socket (info, interface);
-       note ("Listening on Socket/%s", piaddr (info -> address));
+       note ("Listening on Socket/%s/%s",
+             info -> name,
+             (info -> shared_network ?
+              info -> shared_network -> name : "unattached"));
 }
 #endif /* USE_SOCKET_RECEIVE */