diff options
author | LRN <lrn1986@gmail.com> | 2014-08-01 12:20:32 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2014-08-01 12:20:32 +0000 |
commit | 1fed0331759cf7f2c7a60b7a8c3a478f1ebc251d (patch) | |
tree | fce9d0e889f1881dd8d5a3a5ce202096c96b4e2e | |
parent | 976ccd4fc024f26de4b6fc801ba8fea1860430dd (diff) | |
download | gnunet-1fed0331759cf7f2c7a60b7a8c3a478f1ebc251d.tar.gz gnunet-1fed0331759cf7f2c7a60b7a8c3a478f1ebc251d.zip |
Don't use the 'interface' name, it conflicts with definitions in W32 headers
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 32c43a3aa..0d72c1e0f 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c | |||
@@ -453,7 +453,7 @@ struct Plugin | |||
453 | /** | 453 | /** |
454 | * The interface of the wlan card given to us by the user. | 454 | * The interface of the wlan card given to us by the user. |
455 | */ | 455 | */ |
456 | char *interface; | 456 | char *wlan_interface; |
457 | 457 | ||
458 | /** | 458 | /** |
459 | * Tokenizer for demultiplexing of data packets resulting from | 459 | * Tokenizer for demultiplexing of data packets resulting from |
@@ -1953,7 +1953,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) | |||
1953 | GNUNET_SERVER_mst_destroy (plugin->helper_payload_tokenizer); | 1953 | GNUNET_SERVER_mst_destroy (plugin->helper_payload_tokenizer); |
1954 | plugin->helper_payload_tokenizer = NULL; | 1954 | plugin->helper_payload_tokenizer = NULL; |
1955 | } | 1955 | } |
1956 | GNUNET_free_non_null (plugin->interface); | 1956 | GNUNET_free_non_null (plugin->wlan_interface); |
1957 | GNUNET_free (plugin); | 1957 | GNUNET_free (plugin); |
1958 | GNUNET_free (api); | 1958 | GNUNET_free (api); |
1959 | return NULL; | 1959 | return NULL; |
@@ -2107,7 +2107,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
2107 | struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; | 2107 | struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; |
2108 | struct GNUNET_TRANSPORT_PluginFunctions *api; | 2108 | struct GNUNET_TRANSPORT_PluginFunctions *api; |
2109 | struct Plugin *plugin; | 2109 | struct Plugin *plugin; |
2110 | char *interface; | 2110 | char *wlan_interface; |
2111 | unsigned long long testmode; | 2111 | unsigned long long testmode; |
2112 | char *binary; | 2112 | char *binary; |
2113 | 2113 | ||
@@ -2160,7 +2160,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
2160 | GNUNET_CONFIGURATION_get_value_string (env->cfg, | 2160 | GNUNET_CONFIGURATION_get_value_string (env->cfg, |
2161 | CONFIG_NAME, | 2161 | CONFIG_NAME, |
2162 | "INTERFACE", | 2162 | "INTERFACE", |
2163 | &interface)) | 2163 | &wlan_interface)) |
2164 | { | 2164 | { |
2165 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | 2165 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
2166 | CONFIG_NAME, | 2166 | CONFIG_NAME, |
@@ -2169,7 +2169,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
2169 | } | 2169 | } |
2170 | 2170 | ||
2171 | plugin = GNUNET_new (struct Plugin); | 2171 | plugin = GNUNET_new (struct Plugin); |
2172 | plugin->interface = interface; | 2172 | plugin->wlan_interface = wlan_interface; |
2173 | plugin->env = env; | 2173 | plugin->env = env; |
2174 | GNUNET_STATISTICS_set (plugin->env->stats, | 2174 | GNUNET_STATISTICS_set (plugin->env->stats, |
2175 | _("# sessions allocated"), | 2175 | _("# sessions allocated"), |
@@ -2194,7 +2194,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) | |||
2194 | { | 2194 | { |
2195 | case 0: /* normal */ | 2195 | case 0: /* normal */ |
2196 | plugin->helper_argv[0] = (char *) HELPER_NAME; | 2196 | plugin->helper_argv[0] = (char *) HELPER_NAME; |
2197 | plugin->helper_argv[1] = interface; | 2197 | plugin->helper_argv[1] = wlan_interface; |
2198 | plugin->helper_argv[2] = NULL; | 2198 | plugin->helper_argv[2] = NULL; |
2199 | plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO, | 2199 | plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO, |
2200 | HELPER_NAME, | 2200 | HELPER_NAME, |