diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-06 13:36:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-06 13:36:18 +0000 |
commit | 19560d0a705c43f5bc3662c698c1ba11bd67ada3 (patch) | |
tree | f2e6e72f6717c932628d21e81cc399218756cfce /src/vpn | |
parent | 240715f901a8ee70c01f0293ee8fcca76fb85f7d (diff) | |
download | gnunet-19560d0a705c43f5bc3662c698c1ba11bd67ada3.tar.gz gnunet-19560d0a705c43f5bc3662c698c1ba11bd67ada3.zip |
-code cleanup
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-service-vpn.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 87d128814..a896eb6c6 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -3078,11 +3078,11 @@ run (void *cls, | |||
3078 | cfg = cfg_; | 3078 | cfg = cfg_; |
3079 | stats = GNUNET_STATISTICS_create ("vpn", cfg); | 3079 | stats = GNUNET_STATISTICS_create ("vpn", cfg); |
3080 | if (GNUNET_OK != | 3080 | if (GNUNET_OK != |
3081 | GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_MAPPING", | 3081 | GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_MAPPING", |
3082 | &max_destination_mappings)) | 3082 | &max_destination_mappings)) |
3083 | max_destination_mappings = 200; | 3083 | max_destination_mappings = 200; |
3084 | if (GNUNET_OK != | 3084 | if (GNUNET_OK != |
3085 | GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_TUNNELS", | 3085 | GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_TUNNELS", |
3086 | &max_tunnel_mappings)) | 3086 | &max_tunnel_mappings)) |
3087 | max_tunnel_mappings = 200; | 3087 | max_tunnel_mappings = 200; |
3088 | 3088 | ||
@@ -3094,10 +3094,9 @@ run (void *cls, | |||
3094 | 3094 | ||
3095 | vpn_argv[0] = GNUNET_strdup ("vpn-gnunet"); | 3095 | vpn_argv[0] = GNUNET_strdup ("vpn-gnunet"); |
3096 | if (GNUNET_SYSERR == | 3096 | if (GNUNET_SYSERR == |
3097 | GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IFNAME", &ifname)) | 3097 | GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IFNAME", &ifname)) |
3098 | { | 3098 | { |
3099 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3099 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IFNAME"); |
3100 | "No entry 'IFNAME' in configuration!\n"); | ||
3101 | GNUNET_SCHEDULER_shutdown (); | 3100 | GNUNET_SCHEDULER_shutdown (); |
3102 | return; | 3101 | return; |
3103 | } | 3102 | } |
@@ -3105,32 +3104,33 @@ run (void *cls, | |||
3105 | if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET6)) | 3104 | if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET6)) |
3106 | { | 3105 | { |
3107 | if ( (GNUNET_SYSERR == | 3106 | if ( (GNUNET_SYSERR == |
3108 | GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV6ADDR", | 3107 | GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6ADDR", |
3109 | &ipv6addr) || | 3108 | &ipv6addr) || |
3110 | (1 != inet_pton (AF_INET6, ipv6addr, &v6))) ) | 3109 | (1 != inet_pton (AF_INET6, ipv6addr, &v6))) ) |
3111 | { | 3110 | { |
3112 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3111 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR", |
3113 | "No valid entry 'IPV6ADDR' in configuration!\n"); | 3112 | _("Must specify valid IPv6 address")); |
3114 | GNUNET_SCHEDULER_shutdown (); | 3113 | GNUNET_SCHEDULER_shutdown (); |
3115 | return; | 3114 | return; |
3116 | } | 3115 | } |
3117 | vpn_argv[2] = ipv6addr; | 3116 | vpn_argv[2] = ipv6addr; |
3118 | if (GNUNET_SYSERR == | 3117 | if (GNUNET_SYSERR == |
3119 | GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV6PREFIX", | 3118 | GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6PREFIX", |
3120 | &ipv6prefix_s)) | 3119 | &ipv6prefix_s)) |
3121 | { | 3120 | { |
3122 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3121 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6PREFIX"); |
3123 | "No entry 'IPV6PREFIX' in configuration!\n"); | ||
3124 | GNUNET_SCHEDULER_shutdown (); | 3122 | GNUNET_SCHEDULER_shutdown (); |
3125 | return; | 3123 | return; |
3126 | } | 3124 | } |
3127 | vpn_argv[3] = ipv6prefix_s; | 3125 | vpn_argv[3] = ipv6prefix_s; |
3128 | if ( (GNUNET_OK != | 3126 | if ( (GNUNET_OK != |
3129 | GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", | 3127 | GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", |
3130 | "IPV6PREFIX", | 3128 | "IPV6PREFIX", |
3131 | &ipv6prefix)) || | 3129 | &ipv6prefix)) || |
3132 | (ipv6prefix >= 127) ) | 3130 | (ipv6prefix >= 127) ) |
3133 | { | 3131 | { |
3132 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK", | ||
3133 | _("Must specify valid IPv6 mask")); | ||
3134 | GNUNET_SCHEDULER_shutdown (); | 3134 | GNUNET_SCHEDULER_shutdown (); |
3135 | return; | 3135 | return; |
3136 | } | 3136 | } |
@@ -3149,8 +3149,8 @@ run (void *cls, | |||
3149 | &ipv4addr) || | 3149 | &ipv4addr) || |
3150 | (1 != inet_pton (AF_INET, ipv4addr, &v4))) ) | 3150 | (1 != inet_pton (AF_INET, ipv4addr, &v4))) ) |
3151 | { | 3151 | { |
3152 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3152 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR", |
3153 | "No valid entry for 'IPV4ADDR' in configuration!\n"); | 3153 | _("Must specify valid IPv4 address")); |
3154 | GNUNET_SCHEDULER_shutdown (); | 3154 | GNUNET_SCHEDULER_shutdown (); |
3155 | return; | 3155 | return; |
3156 | } | 3156 | } |
@@ -3160,8 +3160,8 @@ run (void *cls, | |||
3160 | &ipv4mask) || | 3160 | &ipv4mask) || |
3161 | (1 != inet_pton (AF_INET, ipv4mask, &v4))) ) | 3161 | (1 != inet_pton (AF_INET, ipv4mask, &v4))) ) |
3162 | { | 3162 | { |
3163 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3163 | GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK", |
3164 | "No valid entry 'IPV4MASK' in configuration!\n"); | 3164 | _("Must specify valid IPv4 mask")); |
3165 | GNUNET_SCHEDULER_shutdown (); | 3165 | GNUNET_SCHEDULER_shutdown (); |
3166 | return; | 3166 | return; |
3167 | } | 3167 | } |