WinIPBroadcast version 1.2 import.

dechamps · Jul 6, 2013 · d00cf35 · d00cf35
1 parent 7b99dc5
commit d00cf35
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+1.2 (15/11/2009)
+- Forgot to close a socket when sending broadcasts, which could cause serious problems on the system (e.g. total freezes) when sending large numbers of broadcast packets.
+
 1.1 (31/10/2009)
 - Handle WSAEHOSTUNREACH correctly in broadcastRouteAddress(). Allows WinIPBroadcast to survive waking from sleep.
 

diff --git a/README.txt b/README.txt
@@ -1,5 +1,5 @@
 README
-WinIPBroadcast 1.1
+WinIPBroadcast 1.2
 By e-t172 <[email protected]>
 http://winipbroadcast.e-t172.net/
 

diff --git a/installer.iss b/installer.iss
@@ -1,16 +1,16 @@
 [Setup]
 AppID=WinIPBroadcast
 AppName=WinIPBroadcast
-AppVerName=WinIPBroadcast 1.1
-AppVersion=1.1
+AppVerName=WinIPBroadcast 1.2
+AppVersion=1.2
 AppPublisher=e-t172
 AppPublisherURL=http://winipbroadcast.e-t172.net/
 AppSupportURL=http://winipbroadcast.e-t172.net/
 AppUpdatesURL=http://winipbroadcast.e-t172.net/
 AppContact=[email protected]
 
 OutputDir=.
-OutputBaseFilename=WinIPBroadcast-1.1
+OutputBaseFilename=WinIPBroadcast-1.2
 
 DefaultDirName={pf}\WinIPBroadcast
 AppendDefaultDirName=no
@@ -27,7 +27,7 @@ Source:"README.txt"; DestDir:"{app}"; Flags: ignoreversion isreadme
 [Registry]
 Root: HKLM; Subkey: "SOFTWARE\WinIPBroadcast"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "SOFTWARE\WinIPBroadcast"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: deletevalue
-Root: HKLM; Subkey: "SOFTWARE\WinIPBroadcast"; ValueType: string; ValueName: "Version"; ValueData: "1.0"; Flags: deletevalue
+Root: HKLM; Subkey: "SOFTWARE\WinIPBroadcast"; ValueType: string; ValueName: "Version"; ValueData: "1.2"; Flags: deletevalue
 
 [Run]
 Filename: "{app}\WinIPBroadcast.exe"; Parameters: "install"; StatusMsg: "Installing service..."; Flags: runhidden

diff --git a/src/WinIPBroadcast.c b/src/WinIPBroadcast.c
@@ -222,13 +222,15 @@ void sendBroadcast(ULONG srcAddress, char *payload, DWORD payloadSize)
 	if (listenSocket == INVALID_SOCKET)
 	{
 		socketError(TEXT("WSASocket"), FALSE);
+		closesocket(socket);
 		return;
 	}
 
 	block = 0;
 	if (WSAIoctl(socket, FIONBIO, &block, sizeof(block), NULL, 0, &len, NULL, NULL) == SOCKET_ERROR)
 	{
 		socketError(TEXT("WSAIoctl(FIONBIO)"), FALSE);
+		closesocket(socket);
 		return;
 	}
 
@@ -239,13 +241,15 @@ void sendBroadcast(ULONG srcAddress, char *payload, DWORD payloadSize)
 	if (bind(socket, (SOCKADDR *)&srcAddr, sizeof(srcAddr)) == SOCKET_ERROR)
 	{
 		socketError(TEXT("bind"), FALSE);
+		closesocket(socket);
 		return;
 	}
 
 	broadcastOpt = TRUE;
 	if (setsockopt(socket, SOL_SOCKET, SO_BROADCAST, (char *)&broadcastOpt, sizeof(broadcastOpt)) == SOCKET_ERROR)
 	{
 		socketError(TEXT("setsockopt(SO_BROADCAST)"), FALSE);
+		closesocket(socket);
 		return;
 	}
 
@@ -260,10 +264,9 @@ void sendBroadcast(ULONG srcAddress, char *payload, DWORD payloadSize)
 
 	if (WSASendTo(socket, &wsaBuffer, 1, &len, 0, (SOCKADDR *)&dstAddr, sizeof(dstAddr), NULL, NULL) != 0)
 		if (WSAGetLastError() != WSAEWOULDBLOCK)
-		{
 			socketError(TEXT("WSASend"), FALSE);
-			return;
-		}
+
+	closesocket(socket);
 }
 
 void relayBroadcast(char *payload, DWORD payloadSize, ULONG srcAddress)