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.
This commit is contained in:
Holger Hans Peter Freyther 2011-05-31 17:52:08 +02:00
parent 3b9b38ca68
commit bac0c98d22
1 changed files with 16 additions and 8 deletions

View File

@ -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;
}