Moved all udp socket stuff to seperate folder.

GamePad64 · Mar 29, 2013 · fe8bac4 · fe8bac4
1 parent f971741
commit fe8bac4
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/.cproject b/.cproject
@@ -66,7 +66,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="test" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="src/daemon/net/TransportSocketEndpoint.cpp|test" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -135,7 +135,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="src/daemon/databases/LocalDistNetDB.cpp|src/daemon/databases/DistNetDB.h|src/daemon/databases/LocalDistNetDB.h|src/daemon/main.cpp|src/daemon/databases/DistNetDB.cpp|src/daemon/extensions|src/daemon/connections|src/common/databases|src/daemon/net/asio" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="src/daemon/net/TransportSocketEndpoint.cpp|src/daemon/databases/LocalDistNetDB.cpp|src/daemon/databases/DistNetDB.h|src/daemon/databases/LocalDistNetDB.h|src/daemon/main.cpp|src/daemon/databases/DistNetDB.cpp|src/daemon/extensions|src/daemon/connections|src/common/databases|src/daemon/net/asio" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -207,7 +207,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="test" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="src/daemon/net/TransportSocketEndpoint.cpp|test" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "Daemon.h"
-#include "net/UDPTransportSocketEndpoint.h"
+#include "net/udp/UDPTransportSocketEndpoint.h"
 #include "net/lpd/UDPLPDv4.h"
 
 namespace p2pnet {

diff --git a/src/daemon/Daemon.h b/src/daemon/Daemon.h
@@ -20,7 +20,7 @@
 #include "databases/MapNetDBStorage.h"
 #include "databases/PersonalKeyStorage.h"
 #include "messaging/TransportSocketMessageDispatcher.h"
-#include "net/UDPTransportSocket.h"
+#include "net/udp/UDPTransportSocket.h"
 #include "net/lpd/UDPLPDv4.h"
 #include "net/lpd/UDPLPDv6.h"
 

diff --git a/src/daemon/net/lpd/UDPLPD.cpp b/src/daemon/net/lpd/UDPLPD.cpp
@@ -14,7 +14,7 @@
 
 #include "UDPLPD.h"
 #include "../../AsioIOService.h"
-#include "../UDPTransportSocket.h"
+#include "../udp/UDPTransportSocket.h"
 #include "../../protobuf/Protocol.pb.h"
 #include "../../databases/PersonalKeyStorage.h"
 

diff --git a/src/daemon/net/lpd/UDPLPD.h b/src/daemon/net/lpd/UDPLPD.h
@@ -20,7 +20,7 @@
 #include "../../databases/NetDBStorage.h"
 #include "../../protobuf/LPDMessage.pb.h"
 #include "../../protobuf/Protocol.pb.h"
-#include "../UDPTransportSocket.h"
+#include "../udp/UDPTransportSocket.h"
 #include <boost/asio.hpp>
 #include <string>
 #include <memory>

diff --git a/src/daemon/net/lpd/UDPLPDv4.cpp b/src/daemon/net/lpd/UDPLPDv4.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "UDPLPDv4.h"
-#include "../UDPTransportSocketEndpoint.h"
+#include "../udp/UDPTransportSocketEndpoint.h"
 
 namespace p2pnet {
 namespace net {

diff --git a/src/daemon/net/lpd/UDPLPDv6.cpp b/src/daemon/net/lpd/UDPLPDv6.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "UDPLPDv6.h"
-#include "../UDPTransportSocketEndpoint.h"
+#include "../udp/UDPTransportSocketEndpoint.h"
 
 namespace p2pnet {
 namespace net {

diff --git a/src/daemon/net/UDPTransportSocket.cpp → src/daemon/net/udp/UDPTransportSocket.cpp b/src/daemon/net/UDPTransportSocket.cpp → src/daemon/net/udp/UDPTransportSocket.cpp
@@ -12,9 +12,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "TransportSocketListener.h"
+#include "../TransportSocketListener.h"
 #include "UDPTransportSocket.h"
-#include "../AsioIOService.h"
+#include "../../AsioIOService.h"
 #include <boost/bind.hpp>
 #include <string>
 

diff --git a/src/daemon/net/UDPTransportSocket.h → src/daemon/net/udp/UDPTransportSocket.h b/src/daemon/net/UDPTransportSocket.h → src/daemon/net/udp/UDPTransportSocket.h
@@ -15,7 +15,7 @@
 #ifndef UDPTRANSPORTSOCKET_H_
 #define UDPTRANSPORTSOCKET_H_
 
-#include "TransportSocket.h"
+#include "../TransportSocket.h"
 #include "UDPTransportSocketEndpoint.h"
 #include <boost/asio.hpp>
 #include <memory>

diff --git a/...daemon/net/UDPTransportSocketEndpoint.cpp → ...on/net/udp/UDPTransportSocketEndpoint.cpp b/...daemon/net/UDPTransportSocketEndpoint.cpp → ...on/net/udp/UDPTransportSocketEndpoint.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "UDPTransportSocketEndpoint.h"
-#include "../protobuf/TransportSocketEndpoint_s.pb.h"
+#include "../../protobuf/TransportSocketEndpoint_s.pb.h"
 #include <sstream>
 
 namespace p2pnet {

diff --git a/src/daemon/net/UDPTransportSocketEndpoint.h → ...emon/net/udp/UDPTransportSocketEndpoint.h b/src/daemon/net/UDPTransportSocketEndpoint.h → ...emon/net/udp/UDPTransportSocketEndpoint.h
@@ -15,7 +15,7 @@
 #ifndef UDPTRANSPORTSOCKETENDPOINT_H_
 #define UDPTRANSPORTSOCKETENDPOINT_H_
 
-#include "TransportSocketEndpoint.h"
+#include "../TransportSocketEndpoint.h"
 #include <memory>
 #include <boost/asio.hpp>
 

diff --git a/src/daemon/peer/PeerRouteSet.h b/src/daemon/peer/PeerRouteSet.h
@@ -17,7 +17,7 @@
 
 #include "../../common/crypto/CryptoTypes.h"
 #include "../relay/RelayTransportSocketEndpoint.h"
-#include "../net/UDPTransportSocketEndpoint.h"
+#include "../net/udp/UDPTransportSocketEndpoint.h"
 #include <list>
 
 namespace p2pnet {