crossroads

commit 07a374c3d9fc2abf35765876f886bc1165bf5e19
parent 2b64756bceb30f5cbafc627a696c52918850d68d
Author: finwo <finwo@pm.me>
Date:   Sat,  3 Jan 2026 19:38:54 +0100

2.73

Diffstat:
M
ChangeLog
 | 
4
++++
M
Makefile
 | 
2
+-
M
xr/SocketHandling/basesocket/accept.cc
 | 
1
+
M
xr/SocketHandling/socket/socket
 | 
2
+-

4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2.73 Upcoming
+- Removed too much debugging verbosity from socket handling
+- Bugfix in basesocket/accept.cc, thanks Mario M. for reporting
+
 2.72 [KK 2011-01-11] 
 - Web interface correctly retrieved in "xrctl list" (including the
   display name and all).
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Top-level Makefile for XR
 # -------------------------
 
-VER	   ?= 2.72
+VER	   ?= 2.73
 PREFIX	   ?= $(DESTDIR)/usr
 BINDIR	   ?= $(PREFIX)/sbin
 MANDIR	   ?= $(PREFIX)/share/man
diff --git a/xr/SocketHandling/basesocket/accept.cc b/xr/SocketHandling/basesocket/accept.cc
@@ -7,6 +7,7 @@ Basesocket *Basesocket::accept() {
     struct sockaddr_in claddr;
 
     debugmsg("About to accept client on server socket " << _fd << '\n');
+    size = sizeof(claddr);
     if ( (f = ::accept(_fd, (struct sockaddr *)&claddr,
 		       (socklen_t *)&size)) >= 0 ) {
 	Basesocket *ret = new Basesocket(f);
diff --git a/xr/SocketHandling/socket/socket b/xr/SocketHandling/socket/socket
@@ -7,7 +7,7 @@
 #include "SocketHandling/basesocket/basesocket"
 
 // To have the smart-socket approach generate debug info:
-#define SOCKET_DEBUG
+// #define SOCKET_DEBUG
 
 class Socket {
 public: