Merge remote-tracking branch 'ProjectTox/master'

1 files changed, 21 insertions, 31 deletions

diff --git a/core/Lossless_UDP.h b/core/Lossless_UDP.h
index 0f5bb119..a9f1bb15 100644
--- a/core/Lossless_UDP.h
+++ b/core/Lossless_UDP.h
@@ -1,26 +1,25 @@
 /* Lossless_UDP.h
-* 
-* An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt
-* 
- 
-    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/>.
-    
-*/
+ * 
+ * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt
+ * 
+ *  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/>.
+ *  
+ */
 
 #ifndef LOSSLESS_UDP_H 
 #define LOSSLESS_UDP_H  
@@ -34,8 +33,6 @@ extern "C" {
 /* maximum length of the data in the data packets */
 #define MAX_DATA_SIZE 1024
 
-
-
 /* Functions */
 
 /* initialize a new connection to ip_port
@@ -53,7 +50,6 @@ int getconnection_id(IP_Port ip_port);
    return -1 if there are no new incoming connections in the list. */
 int incoming_connection();
 
-
 /* return -1 if it could not kill the connection.
    return 0 if killed successfully */
 int kill_connection(int connection_id);
@@ -75,21 +71,16 @@ char id_packet(int connection_id);
    return length of received packet if successful */
 int read_packet(int connection_id, uint8_t * data);
 
-
 /* return 0 if data could not be put in packet queue
    return 1 if data was put into the queue */
 int write_packet(int connection_id, uint8_t * data, uint32_t length);
 
-
-
 /* returns the number of packets in the queue waiting to be successfully sent. */
 uint32_t sendqueue(int connection_id);
 
-
 /* returns the number of packets in the queue waiting to be successfully read with read_packet(...) */
 uint32_t recvqueue(int connection_id);
 
-
 /* check if connection is connected
    return 0 no.
    return 1 if attempting handshake
@@ -98,7 +89,6 @@ uint32_t recvqueue(int connection_id);
    return 4 if timed out and wating to be killed */
 int is_connected(int connection_id);
 
-
 /* Call this function a couple times per second
    It's the main loop. */
 void doLossless_UDP();