[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29074 - in gnunet/src: identity nse vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29074 - in gnunet/src: identity nse vpn |
Date: |
Fri, 6 Sep 2013 15:36:18 +0200 |
Author: grothoff
Date: 2013-09-06 15:36:18 +0200 (Fri, 06 Sep 2013)
New Revision: 29074
Modified:
gnunet/src/identity/gnunet-service-identity.c
gnunet/src/nse/gnunet-nse-profiler.c
gnunet/src/vpn/gnunet-service-vpn.c
Log:
-code cleanup
Modified: gnunet/src/identity/gnunet-service-identity.c
===================================================================
--- gnunet/src/identity/gnunet-service-identity.c 2013-09-06 13:32:37 UTC
(rev 29073)
+++ gnunet/src/identity/gnunet-service-identity.c 2013-09-06 13:36:18 UTC
(rev 29074)
@@ -347,9 +347,11 @@
GNUNET_SERVER_notification_context_broadcast (nc, &sdm->header,
GNUNET_NO);
GNUNET_free (sdm);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_free (identifier);
return;
}
}
+ GNUNET_free (identifier);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to find ego `%s'\n",
name);
Modified: gnunet/src/nse/gnunet-nse-profiler.c
===================================================================
--- gnunet/src/nse/gnunet-nse-profiler.c 2013-09-06 13:32:37 UTC (rev
29073)
+++ gnunet/src/nse/gnunet-nse-profiler.c 2013-09-06 13:36:18 UTC (rev
29074)
@@ -440,8 +440,10 @@
if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
+ GNUNET_free (output_buffer);
return GNUNET_SYSERR;
}
+ GNUNET_free (output_buffer);
return GNUNET_OK;
}
Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2013-09-06 13:32:37 UTC (rev 29073)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2013-09-06 13:36:18 UTC (rev 29074)
@@ -3078,11 +3078,11 @@
cfg = cfg_;
stats = GNUNET_STATISTICS_create ("vpn", cfg);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_MAPPING",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_MAPPING",
&max_destination_mappings))
max_destination_mappings = 200;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "vpn", "MAX_TUNNELS",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "VPN", "MAX_TUNNELS",
&max_tunnel_mappings))
max_tunnel_mappings = 200;
@@ -3094,10 +3094,9 @@
vpn_argv[0] = GNUNET_strdup ("vpn-gnunet");
if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IFNAME", &ifname))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IFNAME", &ifname))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No entry 'IFNAME' in configuration!\n");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IFNAME");
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -3105,32 +3104,33 @@
if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET6))
{
if ( (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV6ADDR",
+ GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6ADDR",
&ipv6addr) ||
(1 != inet_pton (AF_INET6, ipv6addr, &v6))) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No valid entry 'IPV6ADDR' in configuration!\n");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR",
+ _("Must specify valid IPv6 address"));
GNUNET_SCHEDULER_shutdown ();
return;
}
vpn_argv[2] = ipv6addr;
if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "vpn", "IPV6PREFIX",
+ GNUNET_CONFIGURATION_get_value_string (cfg, "VPN", "IPV6PREFIX",
&ipv6prefix_s))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No entry 'IPV6PREFIX' in configuration!\n");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6PREFIX");
GNUNET_SCHEDULER_shutdown ();
return;
}
vpn_argv[3] = ipv6prefix_s;
if ( (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (cfg, "vpn",
+ GNUNET_CONFIGURATION_get_value_number (cfg, "VPN",
"IPV6PREFIX",
&ipv6prefix)) ||
(ipv6prefix >= 127) )
{
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK",
+ _("Must specify valid IPv6 mask"));
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -3149,8 +3149,8 @@
&ipv4addr) ||
(1 != inet_pton (AF_INET, ipv4addr, &v4))) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No valid entry for 'IPV4ADDR' in configuration!\n");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR",
+ _("Must specify valid IPv4 address"));
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -3160,8 +3160,8 @@
&ipv4mask) ||
(1 != inet_pton (AF_INET, ipv4mask, &v4))) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "No valid entry 'IPV4MASK' in configuration!\n");
+ GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4MASK",
+ _("Must specify valid IPv4 mask"));
GNUNET_SCHEDULER_shutdown ();
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29074 - in gnunet/src: identity nse vpn,
gnunet <=