From bac0c98d22b9db20b4def3976c06618e190218de Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 31 May 2011 17:52:08 +0200 Subject: osmo-pcap-client: Do not print the strings if they are NULL this makes glibc add the (null) for us, but we don't want that as we would attempt to compile a filter or open a device with that. --- src/osmo_client_vty.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c index 3af4dfc..056ab18 100644 --- a/src/osmo_client_vty.c +++ b/src/osmo_client_vty.c @@ -49,16 +49,24 @@ DEFUN(cfg_client, static int config_write_client(struct vty *vty) { vty_out(vty, "client%s", VTY_NEWLINE); - vty_out(vty, " pcap device %s%s", - pcap_client->device, VTY_NEWLINE); - vty_out(vty, " pcap filter %s%s", - pcap_client->filter_string, VTY_NEWLINE); + + if (pcap_client->device) + vty_out(vty, " pcap device %s%s", + pcap_client->device, VTY_NEWLINE); + + if (pcap_client->filter_string) + vty_out(vty, " pcap filter %s%s", + pcap_client->filter_string, VTY_NEWLINE); vty_out(vty, " pcap detect-loop %d%s", pcap_client->filter_itself, VTY_NEWLINE); - vty_out(vty, " server ip %s%s", - pcap_client->srv_ip, VTY_NEWLINE); - vty_out(vty, " server port %d%s", - pcap_client->srv_port, VTY_NEWLINE); + + if (pcap_client->srv_ip) + vty_out(vty, " server ip %s%s", + pcap_client->srv_ip, VTY_NEWLINE); + + if (pcap_client->srv_port > 0) + vty_out(vty, " server port %d%s", + pcap_client->srv_port, VTY_NEWLINE); return CMD_SUCCESS; } -- cgit v1.2.3