From 010fc5f3ea31667c35bf19b4ecf312ca03066a6a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 28 Sep 2007 01:34:34 +0000 Subject: [PATCH] Fix indentation; fix DNS server and domain index start numbering (0, not 1) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2903 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- src/vpn-manager/nm-vpn-connection.c | 55 ++++++++++++++--------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index bf67fce23e..13a69666e6 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -179,38 +179,37 @@ print_vpn_config (NMIP4Config *config, const char *tundev, const char *login_banner) { - struct in_addr temp_addr; - char * dns_domain = NULL; - guint32 num; - guint32 i; + struct in_addr temp_addr; + char * dns_domain = NULL; + guint32 num; + guint32 i; - g_return_if_fail (config != NULL); + g_return_if_fail (config != NULL); - temp_addr.s_addr = nm_ip4_config_get_gateway (config); - nm_info ("VPN Gateway: %s", inet_ntoa (temp_addr)); - nm_info ("Tunnel Device: %s", tundev); - temp_addr.s_addr = nm_ip4_config_get_address (config); - nm_info ("Internal IP4 Address: %s", inet_ntoa (temp_addr)); - temp_addr.s_addr = nm_ip4_config_get_netmask (config); - nm_info ("Internal IP4 Netmask: %s", inet_ntoa (temp_addr)); - temp_addr.s_addr = nm_ip4_config_get_ptp_address (config); - nm_info ("Internal IP4 Point-to-Point Address: %s", inet_ntoa (temp_addr)); - nm_info ("Maximum Segment Size (MSS): %d", nm_ip4_config_get_mss (config)); + temp_addr.s_addr = nm_ip4_config_get_gateway (config); + nm_info ("VPN Gateway: %s", inet_ntoa (temp_addr)); + nm_info ("Tunnel Device: %s", tundev); + temp_addr.s_addr = nm_ip4_config_get_address (config); + nm_info ("Internal IP4 Address: %s", inet_ntoa (temp_addr)); + temp_addr.s_addr = nm_ip4_config_get_netmask (config); + nm_info ("Internal IP4 Netmask: %s", inet_ntoa (temp_addr)); + temp_addr.s_addr = nm_ip4_config_get_ptp_address (config); + nm_info ("Internal IP4 Point-to-Point Address: %s", inet_ntoa (temp_addr)); + nm_info ("Maximum Segment Size (MSS): %d", nm_ip4_config_get_mss (config)); - num = nm_ip4_config_get_num_nameservers (config); - for (i = 1; i <= num; i++) - { - temp_addr.s_addr = nm_ip4_config_get_nameserver (config, i); - nm_info ("Internal IP4 DNS: %s", inet_ntoa (temp_addr)); - } + num = nm_ip4_config_get_num_nameservers (config); + for (i = 0; i < num; i++) { + temp_addr.s_addr = nm_ip4_config_get_nameserver (config, i); + nm_info ("Internal IP4 DNS: %s", inet_ntoa (temp_addr)); + } - if (nm_ip4_config_get_num_domains (config) > 0) - dns_domain = (char *) nm_ip4_config_get_domain (config, 1); - nm_info ("DNS Domain: '%s'", dns_domain ? dns_domain : "(none)"); - nm_info ("Login Banner:"); - nm_info ("-----------------------------------------"); - nm_info ("%s", login_banner); - nm_info ("-----------------------------------------"); + if (nm_ip4_config_get_num_domains (config) > 0) + dns_domain = (char *) nm_ip4_config_get_domain (config, 0); + nm_info ("DNS Domain: '%s'", dns_domain ? dns_domain : "(none)"); + nm_info ("Login Banner:"); + nm_info ("-----------------------------------------"); + nm_info ("%s", login_banner); + nm_info ("-----------------------------------------"); } static void