mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 22:35:25 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ted Lemon
1996-05-22 08:14:59 +00:00
parent f4e348de94
commit 939327b9b5
8 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bpf.c
View File

@@ -115,7 +115,8 @@ void if_register_send (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_BPF_SEND */ #endif /* USE_BPF_SEND */
@@ -213,7 +214,8 @@ void if_register_receive (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_BPF_RECEIVE */ #endif /* USE_BPF_RECEIVE */

6
common/bpf.c
View File

@@ -115,7 +115,8 @@ void if_register_send (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_BPF_SEND */ #endif /* USE_BPF_SEND */
@@ -213,7 +214,8 @@ void if_register_receive (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_BPF_RECEIVE */ #endif /* USE_BPF_RECEIVE */

6
common/nit.c
View File

@@ -137,7 +137,8 @@ void if_register_send (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_NIT_SEND */ #endif /* USE_NIT_SEND */
@@ -222,7 +223,8 @@ void if_register_receive (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_NIT_RECEIVE */ #endif /* USE_NIT_RECEIVE */

4
common/raw.c
View File

@@ -96,7 +96,9 @@ void if_register_send (info, interface)
info -> wfdesc = sock; info -> wfdesc = sock;
note ("Sending on Raw/%s/%s", 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) size_t send_packet (interface, packet, raw, len, from, to, hto)

9
common/socket.c
View File

@@ -132,7 +132,9 @@ void if_register_send (info, interface)
info -> wfdesc = info -> rfdesc; info -> wfdesc = info -> rfdesc;
#endif #endif
note ("Sending on Socket/%s/%s", 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 */ #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, /* If we're using the socket API for sending and receiving,
we don't need to register this interface twice. */ we don't need to register this interface twice. */
info -> rfdesc = if_register_socket (info, interface); 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 */ #endif /* USE_SOCKET_RECEIVE */

6
nit.c
View File

@@ -137,7 +137,8 @@ void if_register_send (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_NIT_SEND */ #endif /* USE_NIT_SEND */
@@ -222,7 +223,8 @@ void if_register_receive (info, interface)
print_hw_addr (info -> hw_address.htype, print_hw_addr (info -> hw_address.htype,
info -> hw_address.hlen, info -> hw_address.hlen,
info -> hw_address.haddr), info -> hw_address.haddr),
info -> shared_network -> name); (info -> shared_network ?
info -> shared_network -> name : "unattached"));
} }
#endif /* USE_NIT_RECEIVE */ #endif /* USE_NIT_RECEIVE */

4
raw.c
View File

@@ -96,7 +96,9 @@ void if_register_send (info, interface)
info -> wfdesc = sock; info -> wfdesc = sock;
note ("Sending on Raw/%s/%s", 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) size_t send_packet (interface, packet, raw, len, from, to, hto)

9
socket.c
View File

@@ -132,7 +132,9 @@ void if_register_send (info, interface)
info -> wfdesc = info -> rfdesc; info -> wfdesc = info -> rfdesc;
#endif #endif
note ("Sending on Socket/%s/%s", 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 */ #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, /* If we're using the socket API for sending and receiving,
we don't need to register this interface twice. */ we don't need to register this interface twice. */
info -> rfdesc = if_register_socket (info, interface); 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 */ #endif /* USE_SOCKET_RECEIVE */