diff options
author | xrs <xrs@mail36.net> | 2017-02-28 19:37:43 +0100 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2017-02-28 19:37:43 +0100 |
commit | f82b3a27df765f4a31548ae4efe66dc3dbc42cef (patch) | |
tree | 5a08cd0026d2b85bca3160b6ca40573c871c8635 /src/nat/gnunet-nat.c | |
parent | b0042448a40e90426ea8013b1abba8b2ecb69c2b (diff) | |
parent | a9a6b98c54f5cc3e680c8ea2f9c69e3955e2a7da (diff) | |
download | gnunet-f82b3a27df765f4a31548ae4efe66dc3dbc42cef.tar.gz gnunet-f82b3a27df765f4a31548ae4efe66dc3dbc42cef.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Conflicts:
src/multicast/test_multicast_multipeer.c
Diffstat (limited to 'src/nat/gnunet-nat.c')
-rw-r--r-- | src/nat/gnunet-nat.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c index f198adc0a..80bfb5726 100644 --- a/src/nat/gnunet-nat.c +++ b/src/nat/gnunet-nat.c | |||
@@ -283,6 +283,9 @@ run (void *cls, | |||
283 | return; | 283 | return; |
284 | } | 284 | } |
285 | } | 285 | } |
286 | |||
287 | remote_len = 0; | ||
288 | |||
286 | if (NULL != remote_addr) | 289 | if (NULL != remote_addr) |
287 | { | 290 | { |
288 | remote_len = GNUNET_STRINGS_parse_socket_addr (remote_addr, | 291 | remote_len = GNUNET_STRINGS_parse_socket_addr (remote_addr, |