diff options
Diffstat (limited to 'src/util/connection.c')
-rw-r--r-- | src/util/connection.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util/connection.c b/src/util/connection.c index 95fbb13f8..6d3070415 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -372,7 +372,7 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access_cb, | |||
372 | #if HAVE_SOCKADDR_IN_SIN_LEN | 372 | #if HAVE_SOCKADDR_IN_SIN_LEN |
373 | v4->sin_len = (u_char) sizeof (struct sockaddr_in); | 373 | v4->sin_len = (u_char) sizeof (struct sockaddr_in); |
374 | #endif | 374 | #endif |
375 | memcpy (&v4->sin_addr, | 375 | GNUNET_memcpy (&v4->sin_addr, |
376 | &((char *) &v6->sin6_addr)[sizeof (struct in6_addr) - | 376 | &((char *) &v6->sin6_addr)[sizeof (struct in6_addr) - |
377 | sizeof (struct in_addr)], | 377 | sizeof (struct in_addr)], |
378 | sizeof (struct in_addr)); | 378 | sizeof (struct in_addr)); |
@@ -383,7 +383,7 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access_cb, | |||
383 | else | 383 | else |
384 | { | 384 | { |
385 | uaddr = GNUNET_malloc (addrlen); | 385 | uaddr = GNUNET_malloc (addrlen); |
386 | memcpy (uaddr, addr, addrlen); | 386 | GNUNET_memcpy (uaddr, addr, addrlen); |
387 | } | 387 | } |
388 | gcp = NULL; | 388 | gcp = NULL; |
389 | gc.uid = 0; | 389 | gc.uid = 0; |
@@ -479,7 +479,7 @@ GNUNET_CONNECTION_get_address (struct GNUNET_CONNECTION_Handle *connection, | |||
479 | if ((NULL == connection->addr) || (0 == connection->addrlen)) | 479 | if ((NULL == connection->addr) || (0 == connection->addrlen)) |
480 | return GNUNET_NO; | 480 | return GNUNET_NO; |
481 | *addr = GNUNET_malloc (connection->addrlen); | 481 | *addr = GNUNET_malloc (connection->addrlen); |
482 | memcpy (*addr, connection->addr, connection->addrlen); | 482 | GNUNET_memcpy (*addr, connection->addr, connection->addrlen); |
483 | *addrlen = connection->addrlen; | 483 | *addrlen = connection->addrlen; |
484 | return GNUNET_OK; | 484 | return GNUNET_OK; |
485 | } | 485 | } |
@@ -726,7 +726,7 @@ connect_probe_continuation (void *cls) | |||
726 | connection->sock = ap->sock; | 726 | connection->sock = ap->sock; |
727 | GNUNET_assert (NULL == connection->addr); | 727 | GNUNET_assert (NULL == connection->addr); |
728 | connection->addr = GNUNET_malloc (ap->addrlen); | 728 | connection->addr = GNUNET_malloc (ap->addrlen); |
729 | memcpy (connection->addr, ap->addr, ap->addrlen); | 729 | GNUNET_memcpy (connection->addr, ap->addr, ap->addrlen); |
730 | connection->addrlen = ap->addrlen; | 730 | connection->addrlen = ap->addrlen; |
731 | GNUNET_free (ap); | 731 | GNUNET_free (ap); |
732 | /* cancel all other attempts */ | 732 | /* cancel all other attempts */ |
@@ -781,7 +781,7 @@ try_connect_using_address (void *cls, | |||
781 | connection->port); | 781 | connection->port); |
782 | ap = GNUNET_malloc (sizeof (struct AddressProbe) + addrlen); | 782 | ap = GNUNET_malloc (sizeof (struct AddressProbe) + addrlen); |
783 | ap->addr = (const struct sockaddr *) &ap[1]; | 783 | ap->addr = (const struct sockaddr *) &ap[1]; |
784 | memcpy (&ap[1], addr, addrlen); | 784 | GNUNET_memcpy (&ap[1], addr, addrlen); |
785 | ap->addrlen = addrlen; | 785 | ap->addrlen = addrlen; |
786 | ap->connection = connection; | 786 | ap->connection = connection; |
787 | 787 | ||
@@ -976,7 +976,7 @@ GNUNET_CONNECTION_connect_socket (struct GNUNET_NETWORK_Handle *s, | |||
976 | } | 976 | } |
977 | connection = GNUNET_CONNECTION_create_from_existing (s); | 977 | connection = GNUNET_CONNECTION_create_from_existing (s); |
978 | connection->addr = GNUNET_malloc (addrlen); | 978 | connection->addr = GNUNET_malloc (addrlen); |
979 | memcpy (connection->addr, serv_addr, addrlen); | 979 | GNUNET_memcpy (connection->addr, serv_addr, addrlen); |
980 | connection->addrlen = addrlen; | 980 | connection->addrlen = addrlen; |
981 | LOG (GNUNET_ERROR_TYPE_INFO, | 981 | LOG (GNUNET_ERROR_TYPE_INFO, |
982 | "Trying to connect to `%s' (%p)\n", | 982 | "Trying to connect to `%s' (%p)\n", |