diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-06-26 17:21:22 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-06-26 17:21:22 +0000 |
commit | 3999807382f98843cdde19211fc94484d0793087 (patch) | |
tree | eab97299e72edbfdd5d6f409db0729d9780d3e5e /src/exit | |
parent | abc1a0ea19b7dc199b83749d31e32622c7469ded (diff) | |
download | gnunet-3999807382f98843cdde19211fc94484d0793087.tar.gz gnunet-3999807382f98843cdde19211fc94484d0793087.zip |
-introducing signing of regex accept states, removing PID from regex API
Diffstat (limited to 'src/exit')
-rw-r--r-- | src/exit/gnunet-daemon-exit.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index d7da94756..4e94ea596 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -389,11 +389,6 @@ static struct TunnelState *tunnels[UINT16_MAX + 1]; | |||
389 | static struct GNUNET_DNSSTUB_Context *dnsstub; | 389 | static struct GNUNET_DNSSTUB_Context *dnsstub; |
390 | 390 | ||
391 | /** | 391 | /** |
392 | * Identity of this peer. | ||
393 | */ | ||
394 | static struct GNUNET_PeerIdentity my_identity; | ||
395 | |||
396 | /** | ||
397 | * Are we an IPv4-exit? | 392 | * Are we an IPv4-exit? |
398 | */ | 393 | */ |
399 | static int ipv4_exit; | 394 | static int ipv4_exit; |
@@ -3569,14 +3564,6 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
3569 | 3564 | ||
3570 | connections_map = GNUNET_CONTAINER_multihashmap_create (65536, GNUNET_NO); | 3565 | connections_map = GNUNET_CONTAINER_multihashmap_create (65536, GNUNET_NO); |
3571 | connections_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 3566 | connections_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
3572 | if (GNUNET_OK != | ||
3573 | GNUNET_CRYPTO_get_host_identity (cfg, | ||
3574 | &my_identity)) | ||
3575 | { | ||
3576 | GNUNET_break (0); | ||
3577 | GNUNET_SCHEDULER_shutdown (); | ||
3578 | return; | ||
3579 | } | ||
3580 | mesh_handle | 3567 | mesh_handle |
3581 | = GNUNET_MESH_connect (cfg, NULL, | 3568 | = GNUNET_MESH_connect (cfg, NULL, |
3582 | &new_tunnel, | 3569 | &new_tunnel, |
@@ -3600,8 +3587,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
3600 | (void) GNUNET_asprintf (&prefixed_regex, "%s%s%s", | 3587 | (void) GNUNET_asprintf (&prefixed_regex, "%s%s%s", |
3601 | GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX, | 3588 | GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX, |
3602 | "4", regex); | 3589 | "4", regex); |
3603 | regex4 = GNUNET_REGEX_announce (cfg, | 3590 | regex4 = GNUNET_REGEX_announce (cfg, |
3604 | &my_identity, | ||
3605 | prefixed_regex, | 3591 | prefixed_regex, |
3606 | REGEX_REFRESH_FREQUENCY, | 3592 | REGEX_REFRESH_FREQUENCY, |
3607 | REGEX_MAX_PATH_LEN_IPV4); | 3593 | REGEX_MAX_PATH_LEN_IPV4); |
@@ -3621,7 +3607,6 @@ run (void *cls, char *const *args GNUNET_UNUSED, | |||
3621 | GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX, | 3607 | GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX, |
3622 | "6", regex); | 3608 | "6", regex); |
3623 | regex6 = GNUNET_REGEX_announce (cfg, | 3609 | regex6 = GNUNET_REGEX_announce (cfg, |
3624 | &my_identity, | ||
3625 | prefixed_regex, | 3610 | prefixed_regex, |
3626 | REGEX_REFRESH_FREQUENCY, | 3611 | REGEX_REFRESH_FREQUENCY, |
3627 | REGEX_MAX_PATH_LEN_IPV6); | 3612 | REGEX_MAX_PATH_LEN_IPV6); |