diff options
author | marshall <stmr@umich.edu> | 2023-08-22 12:55:51 -0400 |
---|---|---|
committer | marshall <stmr@umich.edu> | 2023-08-22 12:55:51 -0400 |
commit | dbff260838b57c3306401bcbd89dbed0ec4edb2e (patch) | |
tree | 60b331252d6bd4d7feea88a3b1404df09776ffc4 /src/transport | |
parent | 0fbfab67d4b2b227460ab0e38670c4cbc7e5ffcd (diff) | |
download | gnunet-dbff260838b57c3306401bcbd89dbed0ec4edb2e.tar.gz gnunet-dbff260838b57c3306401bcbd89dbed0ec4edb2e.zip |
quic: logs
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-communicator-quic.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/transport/gnunet-communicator-quic.c b/src/transport/gnunet-communicator-quic.c index 0f3219aad..0f7d5fb04 100644 --- a/src/transport/gnunet-communicator-quic.c +++ b/src/transport/gnunet-communicator-quic.c | |||
@@ -720,9 +720,7 @@ udp_address_to_sockaddr (const char *bindto, socklen_t *sock_len) | |||
720 | { | 720 | { |
721 | v4.sin_family = AF_INET; | 721 | v4.sin_family = AF_INET; |
722 | v4.sin_port = htons ((uint16_t) port); | 722 | v4.sin_port = htons ((uint16_t) port); |
723 | #if HAVE_SOCKADDR_IN_SIN_LEN | ||
724 | v4.sin_len = sizeof(struct sockaddr_in); | 723 | v4.sin_len = sizeof(struct sockaddr_in); |
725 | #endif | ||
726 | in = GNUNET_memdup (&v4, sizeof(struct sockaddr_in)); | 724 | in = GNUNET_memdup (&v4, sizeof(struct sockaddr_in)); |
727 | *sock_len = sizeof(struct sockaddr_in); | 725 | *sock_len = sizeof(struct sockaddr_in); |
728 | GNUNET_free (cp); | 726 | GNUNET_free (cp); |
@@ -1001,7 +999,9 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer_id, const | |||
1001 | /** | 999 | /** |
1002 | * If we already have a queue with this peer, ignore | 1000 | * If we already have a queue with this peer, ignore |
1003 | */ | 1001 | */ |
1004 | GNUNET_CRYPTO_hash (&in, in_len, &addr_key); | 1002 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "address string in mq_init: %s\n", |
1003 | address); | ||
1004 | GNUNET_CRYPTO_hash (&address, strlen (address), &addr_key); | ||
1005 | peer = GNUNET_CONTAINER_multihashmap_get (addr_map, &addr_key); | 1005 | peer = GNUNET_CONTAINER_multihashmap_get (addr_map, &addr_key); |
1006 | if (NULL != peer) | 1006 | if (NULL != peer) |
1007 | { | 1007 | { |
@@ -1028,6 +1028,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer_id, const | |||
1028 | GNUNET_CONTAINER_multihashmap_put (addr_map, &addr_key, | 1028 | GNUNET_CONTAINER_multihashmap_put (addr_map, &addr_key, |
1029 | peer, | 1029 | peer, |
1030 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 1030 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); |
1031 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "hash: %s\n", GNUNET_h2s (&addr_key)); | ||
1031 | struct sockaddr_in *testp = (struct sockaddr_in *) peer->address; | 1032 | struct sockaddr_in *testp = (struct sockaddr_in *) peer->address; |
1032 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1033 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1033 | "mq_init added new peer to the addr map. sin_len: %d\n", | 1034 | "mq_init added new peer to the addr map. sin_len: %d\n", |
@@ -1254,8 +1255,17 @@ sock_read (void *cls) | |||
1254 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv"); | 1255 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "recv"); |
1255 | return; | 1256 | return; |
1256 | } | 1257 | } |
1257 | GNUNET_CRYPTO_hash ((struct sockaddr *) &sa, salen, | 1258 | /** |
1259 | * FIXME: hash addr, port combination not just port | ||
1260 | */ | ||
1261 | struct sockaddr_in *testp = (struct sockaddr_in *) &sa; | ||
1262 | const char *addr_string = sockaddr_to_udpaddr_string ((const struct | ||
1263 | sockaddr *) &sa, | ||
1264 | salen); | ||
1265 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "address string: %s\n", addr_string); | ||
1266 | GNUNET_CRYPTO_hash (&addr_string, strlen (addr_string), | ||
1258 | &addr_key); | 1267 | &addr_key); |
1268 | GNUNET_free (addr_string); | ||
1259 | peer = GNUNET_CONTAINER_multihashmap_get (addr_map, &addr_key); | 1269 | peer = GNUNET_CONTAINER_multihashmap_get (addr_map, &addr_key); |
1260 | 1270 | ||
1261 | if (NULL == peer) | 1271 | if (NULL == peer) |
@@ -1270,7 +1280,10 @@ sock_read (void *cls) | |||
1270 | peer->conn = NULL; | 1280 | peer->conn = NULL; |
1271 | peer->foreign_addr = sockaddr_to_udpaddr_string (peer->address, | 1281 | peer->foreign_addr = sockaddr_to_udpaddr_string (peer->address, |
1272 | peer->address_len); | 1282 | peer->address_len); |
1273 | setup_peer_mq (peer); | 1283 | /** |
1284 | * TODO: after connection established | ||
1285 | */ | ||
1286 | // setup_peer_mq (peer); | ||
1274 | if (GNUNET_SYSERR == GNUNET_CONTAINER_multihashmap_put (addr_map, | 1287 | if (GNUNET_SYSERR == GNUNET_CONTAINER_multihashmap_put (addr_map, |
1275 | &addr_key, | 1288 | &addr_key, |
1276 | peer, | 1289 | peer, |
@@ -1280,9 +1293,11 @@ sock_read (void *cls) | |||
1280 | "tried to add duplicate address into address map\n"); | 1293 | "tried to add duplicate address into address map\n"); |
1281 | return; | 1294 | return; |
1282 | } | 1295 | } |
1283 | struct sockaddr_in *testp = (struct sockaddr_in *) peer->address; | 1296 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "hash: %s\n", GNUNET_h2s ( |
1297 | &addr_key)); | ||
1298 | |||
1284 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1299 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1285 | "sock_read added new peer to address map. port: %d\n", | 1300 | "sock_read added new peer to address map. sin_len: %d\n", |
1286 | testp->sin_len); | 1301 | testp->sin_len); |
1287 | } | 1302 | } |
1288 | 1303 | ||