win 10/13

main
MonHun 2023-10-13 18:01:26 +09:00
parent f761528a5c
commit c240e01c1c
4 changed files with 262537 additions and 87830 deletions

View File

@ -1 +1 @@
21792 9388

File diff suppressed because it is too large Load Diff

View File

@ -130,12 +130,6 @@ public class UDPSocket {
try { try {
udpport.setActive(false); udpport.setActive(false);
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
if(inOut.equals("SEND")) { if(inOut.equals("SEND")) {
udpport.setRemoteHost(ip); udpport.setRemoteHost(ip);
@ -143,11 +137,6 @@ public class UDPSocket {
udpport.setActive(true); udpport.setActive(true);
}else{ }else{
<<<<<<< Updated upstream
udpport.setLocalPort(port);
=======
udpport.setLocalPort(port);
>>>>>>> Stashed changes
udpport.setActive(true); udpport.setActive(true);
if( !(multiCastGroup == null || multiCastGroup.equals("")) ) if( !(multiCastGroup == null || multiCastGroup.equals("")) )

View File

@ -6,7 +6,7 @@ spring:
- winTest - winTest
server: server:
port: 18080 port: 18090
root: D:\Workspace\Odroid_repository\SACP_Components\socket root: D:\Workspace\Odroid_repository\SACP_Components\socket