diff options
author | Christian Fuchs <christian.fuchs@cfuchs.net> | 2014-06-17 10:35:26 +0000 |
---|---|---|
committer | Christian Fuchs <christian.fuchs@cfuchs.net> | 2014-06-17 10:35:26 +0000 |
commit | f82cdb61caf9955ea56c6df9448b95ec4e3aacd3 (patch) | |
tree | eed6d199b16a898db2cbf116037e41e0e0183299 /src/nat/nat.c | |
parent | 4ef7a6973707d2e5588372861197f7068737e765 (diff) | |
download | gnunet-f82cdb61caf9955ea56c6df9448b95ec4e3aacd3.tar.gz gnunet-f82cdb61caf9955ea56c6df9448b95ec4e3aacd3.zip |
- renamed NAT's failure code to status code across gnunet (not GTK yet)
- added proper error reporting to NAT-test-start/stop
- timed-out nat tests not automatically stop the test itself
- fixed a design flaw in nat-test
- fixed a potential crash in the tests of the nat functionality (NOT NAT_TEST_xy...)
Diffstat (limited to 'src/nat/nat.c')
-rw-r--r-- | src/nat/nat.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/nat/nat.c b/src/nat/nat.c index 670ae6a27..61ca5eab7 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c | |||
@@ -1018,7 +1018,7 @@ upnp_add (void *cls, | |||
1018 | int add_remove, | 1018 | int add_remove, |
1019 | const struct sockaddr *addr, | 1019 | const struct sockaddr *addr, |
1020 | socklen_t addrlen, | 1020 | socklen_t addrlen, |
1021 | enum GNUNET_NAT_FailureCode ret) | 1021 | enum GNUNET_NAT_StatusCode ret) |
1022 | { | 1022 | { |
1023 | struct GNUNET_NAT_Handle *h = cls; | 1023 | struct GNUNET_NAT_Handle *h = cls; |
1024 | struct LocalAddressList *pos; | 1024 | struct LocalAddressList *pos; |
@@ -1561,4 +1561,21 @@ GNUNET_NAT_test_address (struct GNUNET_NAT_Handle *h, | |||
1561 | } | 1561 | } |
1562 | 1562 | ||
1563 | 1563 | ||
1564 | /** | ||
1565 | * Converts enum GNUNET_NAT_StatusCode to a string | ||
1566 | * | ||
1567 | * @param err error code to resolve to a string | ||
1568 | * @return point to a static string containing the error code | ||
1569 | */ | ||
1570 | const char * | ||
1571 | GNUNET_NAT_status2string (enum GNUNET_NAT_StatusCode err){ | ||
1572 | switch (err){ | ||
1573 | case GNUNET_NAT_ERROR_SUCCESS: | ||
1574 | return _("Operation Successful"); | ||
1575 | |||
1576 | default: | ||
1577 | return "unknown status code"; | ||
1578 | } | ||
1579 | } | ||
1580 | |||
1564 | /* end of nat.c */ | 1581 | /* end of nat.c */ |