Merge remote-tracking branch 'ProjectTox/master'

1 files changed, 37 insertions, 46 deletions

diff --git a/core/network.c b/core/network.c
index d4e25c82..ec234593 100644
--- a/core/network.c
+++ b/core/network.c
@@ -1,30 +1,28 @@
 /* network.h
-* 
-* Functions for the core networking.
-* 
- 
-    Copyright (C) 2013 Tox project All Rights Reserved.
-
-    This file is part of Tox.
-
-    Tox is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Tox is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Tox.  If not, see <http://www.gnu.org/licenses/>.
-    
-*/
+ * 
+ * Functions for the core networking.
+ * 
+ *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *  
+ */
 
 #include "network.h"
 
-
 /* returns current UNIX time in microseconds (us). */
 uint64_t current_time()
 {
@@ -44,8 +42,6 @@ uint64_t current_time()
     time = 1000000UL*a.tv_sec + a.tv_usec;
     return time;
     #endif
-    
-    
 }
 
 /* return a random number
@@ -69,7 +65,6 @@ int sendpacket(IP_Port ip_port, uint8_t * data, uint32_t length)
 {
     ADDR addr = {AF_INET, ip_port.port, ip_port.ip}; 
     return sendto(sock,(char *) data, length, 0, (struct sockaddr *)&addr, sizeof(addr));
-    
 }
 
 /* Function to receive data, ip and port of sender is put into ip_port
@@ -94,7 +89,6 @@ int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
     ip_port->ip = addr.ip;
     ip_port->port = addr.port;
     return 0;
-    
 }
 
 /* initialize networking
@@ -103,32 +97,28 @@ int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
    port is in host byte order (this means don't worry about it)
    returns 0 if no problems 
    returns -1 if there are problems */
-int init_networking(IP ip ,uint16_t port)
+int init_networking(IP ip, uint16_t port)
 {
     #ifdef WIN32
     WSADATA wsaData;
     if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR)
-    {
         return -1;
-    }
-    
     #else
     srandom((uint32_t)current_time());
     #endif
     srand((uint32_t)current_time());
-    
+
     /* initialize our socket */
     sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 
 
-        /* Check for socket error */
-        #ifdef WIN32
-        if (sock == INVALID_SOCKET) //MSDN recommends this
-                return -1;
-        #else
-        if (sock < 0)
-                return -1;
-        #endif
-
+    /* Check for socket error */
+    #ifdef WIN32
+    if (sock == INVALID_SOCKET) /* MSDN recommends this */
+        return -1;
+    #else
+    if (sock < 0)
+        return -1;
+    #endif
 
     /* Functions to increase the size of the send and receive UDP buffers
        NOTE: uncomment if necessary */
@@ -140,10 +130,13 @@ int init_networking(IP ip ,uint16_t port)
     }
 
     if(setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char*)&n, sizeof(n)) == -1)
-    {
         return -1;
-    }*/
+    */
     
+    /* Enable broadcast on socket */
+    int broadcast = 1;
+    setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char*)&broadcast, sizeof(broadcast));
+
     /* Set socket nonblocking */
     #ifdef WIN32
     /* I think this works for windows */
@@ -190,11 +183,9 @@ int resolve_addr(char *address)
 
     int success = getaddrinfo(address, "7", &hints, &server);
     if(success != 0)
-    {
         return -1;
-    }
 
     int resolved = ((struct sockaddr_in*)server->ai_addr)->sin_addr.s_addr;
     freeaddrinfo(server);
     return resolved;
-}
\ No newline at end of file
+}