diff options
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 3 | ||||
-rw-r--r-- | src/include/gnunet_json_lib.h | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index c0572fe40..956faf983 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -3012,6 +3012,9 @@ signal_socks_failure (struct Socks5Request *s5r, | |||
3012 | { | 3012 | { |
3013 | struct Socks5ServerResponseMessage *s_resp; | 3013 | struct Socks5ServerResponseMessage *s_resp; |
3014 | 3014 | ||
3015 | GNUNET_break (0 == s5r->wbuf_len); /* Should happen first in any transmission, right? */ | ||
3016 | GNUNET_assert (SOCKS_BUFFERSIZE - s5r->wbuf_len >= | ||
3017 | sizeof(struct Socks5ServerResponseMessage)); | ||
3015 | s_resp = (struct Socks5ServerResponseMessage *) &s5r->wbuf[s5r->wbuf_len]; | 3018 | s_resp = (struct Socks5ServerResponseMessage *) &s5r->wbuf[s5r->wbuf_len]; |
3016 | memset (s_resp, 0, sizeof(struct Socks5ServerResponseMessage)); | 3019 | memset (s_resp, 0, sizeof(struct Socks5ServerResponseMessage)); |
3017 | s_resp->version = SOCKS_VERSION_5; | 3020 | s_resp->version = SOCKS_VERSION_5; |
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index 064f38c9f..82b8502e0 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h | |||
@@ -49,9 +49,10 @@ struct GNUNET_JSON_Specification; | |||
49 | * @return #GNUNET_SYSERR on error, | 49 | * @return #GNUNET_SYSERR on error, |
50 | * #GNUNET_OK on success | 50 | * #GNUNET_OK on success |
51 | */ | 51 | */ |
52 | typedef int (*GNUNET_JSON_Parser) (void *cls, | 52 | typedef int |
53 | json_t *root, | 53 | (*GNUNET_JSON_Parser) (void *cls, |
54 | struct GNUNET_JSON_Specification *spec); | 54 | json_t *root, |
55 | struct GNUNET_JSON_Specification *spec); | ||
55 | 56 | ||
56 | 57 | ||
57 | /** | 58 | /** |
@@ -60,8 +61,9 @@ typedef int (*GNUNET_JSON_Parser) (void *cls, | |||
60 | * @param cls closure | 61 | * @param cls closure |
61 | * @param spec our specification entry with data to clean. | 62 | * @param spec our specification entry with data to clean. |
62 | */ | 63 | */ |
63 | typedef void (*GNUNET_JSON_Cleaner) (void *cls, | 64 | typedef void |
64 | struct GNUNET_JSON_Specification *spec); | 65 | (*GNUNET_JSON_Cleaner) (void *cls, |
66 | struct GNUNET_JSON_Specification *spec); | ||
65 | 67 | ||
66 | 68 | ||
67 | /** | 69 | /** |