== Frameserver ==

Set SO_REUSEADDR on server-socket, since otherwise, frameserver will barf on
second start.

1 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c
index 58d8f82d454..76832922dcf 100644
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -28,6 +28,7 @@
 #else
 #include <sys/time.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
@@ -90,6 +91,7 @@ static int closesocket(int fd) {
 void start_frameserver(RenderData *rd, int rectx, int recty)
 {
         struct sockaddr_in      addr;
+	int arg = 1;
 
 	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
 		G.afbreek = 1; /* Abort render */
@@ -97,6 +99,9 @@ void start_frameserver(RenderData *rd, int rectx, int recty)
 		return;
         }
 
+	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
+                   (char*) &arg, sizeof(arg));
+
 	addr.sin_family = AF_INET;
         addr.sin_port = htons(U.frameserverport);
         addr.sin_addr.s_addr = INADDR_ANY;