diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-10-25 14:30:12 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-10-25 14:30:12 +0000 |
commit | da627cbf2b7bc36c48e8a1181282d96948cc5c39 (patch) | |
tree | 2cb99ec63fed0a173fff76427490f514fbf42c30 /src/include | |
parent | 5c3a3274ff2298ace3eb53e26401eaf1a1bceb3e (diff) | |
download | gnunet-da627cbf2b7bc36c48e8a1181282d96948cc5c39.tar.gz gnunet-da627cbf2b7bc36c48e8a1181282d96948cc5c39.zip |
-missing commit
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_configuration_lib.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_nat_service.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h index f28879df7..945f3ca59 100644 --- a/src/include/gnunet_configuration_lib.h +++ b/src/include/gnunet_configuration_lib.h | |||
@@ -140,7 +140,7 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
140 | int | 140 | int |
141 | GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg, | 141 | GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg, |
142 | const char *mem, | 142 | const char *mem, |
143 | const size_t size, | 143 | size_t size, |
144 | int allow_inline); | 144 | int allow_inline); |
145 | 145 | ||
146 | 146 | ||
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h index db7eb2148..ad3438538 100644 --- a/src/include/gnunet_nat_service.h +++ b/src/include/gnunet_nat_service.h | |||
@@ -442,9 +442,14 @@ enum GNUNET_NAT_Type | |||
442 | GNUNET_NAT_TYPE_STUN_PUNCHED_NAT, | 442 | GNUNET_NAT_TYPE_STUN_PUNCHED_NAT, |
443 | 443 | ||
444 | /** | 444 | /** |
445 | * WE can traverse using UPNP | 445 | * We can traverse using UPNP |
446 | */ | 446 | */ |
447 | GNUNET_NAT_TYPE_UPNP_NAT | 447 | GNUNET_NAT_TYPE_UPNP_NAT, |
448 | |||
449 | /** | ||
450 | * We know nothing about the NAT. | ||
451 | */ | ||
452 | GNUNET_NAT_TYPE_UNKNOWN | ||
448 | 453 | ||
449 | }; | 454 | }; |
450 | 455 | ||