summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Biro <nurupo.contributions@gmail.com>2017-04-16 05:56:37 -0400
committerMaxim Biro <nurupo.contributions@gmail.com>2017-04-22 15:31:25 -0400
commit5ed37e543825c023163adba95b99ea81d3337196 (patch)
tree2a16a1738642db7e38e1b91a48ed404da9939285
parentf6285d7a60a75773f91754d5f254192139b5ceb8 (diff)
Revert "Fix TokTok/c-toxcore#535"
This reverts commit 439f676d45d75f59f47a000a6adca8e9fe6a6e4e.
-rw-r--r--toxcore/TCP_client.h2
-rw-r--r--toxcore/network.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index 90002214..8a698869 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -58,7 +58,7 @@ enum {
58}; 58};
59typedef struct { 59typedef struct {
60 uint8_t status; 60 uint8_t status;
61 Socket sock; 61 Socket sock;
62#ifdef HAVE_LIBEV 62#ifdef HAVE_LIBEV
63 struct { 63 struct {
64 ev_io listener; 64 ev_io listener;
diff --git a/toxcore/network.c b/toxcore/network.c
index a68e91f4..f74363e6 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -674,8 +674,6 @@ Networking_Core *new_networking_ex(Logger *log, IP ip, uint16_t port_from, uint1
674 struct sockaddr_storage addr; 674 struct sockaddr_storage addr;
675 size_t addrsize; 675 size_t addrsize;
676 676
677 memset(&addr, 0, sizeof(struct sockaddr_storage));
678
679 if (temp->family == AF_INET) { 677 if (temp->family == AF_INET) {
680 struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr; 678 struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr;
681 679