crossroads

commit eb9f7be999fe95ff84b42f8d82314bb4d03314a7
parent 84e1b9c6632921818c00f6c033014ec1cead8881
Author: finwo <finwo@pm.me>
Date:   Sat,  3 Jan 2026 19:39:10 +0100

2.79

Diffstat:
M
ChangeLog
 | 
3
+++
M
Makefile
 | 
2
+-
M
xr/Makefile
 | 
8
++++----
M
xr/netbuffer/netread.cc
 | 
3
+++

4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2.79 [KK 2012-04-19]
+- Bugfix in the web interface network handling.
+
 2.78 [KK 2012-04-18]
 - xrctl fixes, thanks Carlos H. for reporting!
 
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Top-level Makefile for XR
 # -------------------------
 
-VER	   ?= 2.78
+VER	   ?= 2.79
 PREFIX	   ?= $(DESTDIR)/usr
 BINDIR	   ?= $(PREFIX)/sbin
 MANDIR	   ?= $(PREFIX)/share/man
diff --git a/xr/Makefile b/xr/Makefile
@@ -23,8 +23,8 @@ foo:
 	$(MAKE) $(BIN)
 
 install: $(BINDIR)/xr
-$(BINDIR)/xr: $(BUILDDIR)/xr
-	cp $(BUILDDIR)/xr $(TMPXR)
+$(BINDIR)/xr: $(BIN)
+	cp $(BIN) $(TMPXR)
 	strip $(TMPXR)
 	install $(TMPXR) $(BINDIR)/xr
 	rm -f $(TMPXR)
@@ -35,7 +35,7 @@ subdirs: $(BUILDDIR)/usage.h $(BUILDDIR)/status.xslt.h
 	   echo "Making: $$f"; \
 	   BASE=$(BASE) CC=$(CONF_CC) BUILDDIR=$(BUILDDIR) VER='$(VER)' \
 	     AUTHOR='$(AUTHOR)' MAINTAINER='$(MAINTAINER)' \
-	     DISTSITE='$(DISTSITE)' MEMDEBUG=$(MEMDEBUG)\
+	     DISTSITE='$(DISTSITE)' MEMDEBUG=$(MEMDEBUG) BINDIR='$(BINDIR)' \
 	     CONF_CC='$(CONF_CC)' CONF_LIB='$(CONF_LIB)' \
 	     CONF_GETOPT=$(CONF_GETOPT) CONF_GETOPT_LONG=$(CONF_GETOPT_LONG) \
 	     CONF_INET_ATON=$(CONF_INET_ATON) \
@@ -53,7 +53,7 @@ $(BUILDDIR)/status.xslt.h: etc/status.xslt
 	etc/e-txt2c XSLT  <etc/status.xslt >$(BUILDDIR)/status.xslt.h
 	touch webinterface/answerxslt.cc
 
-$(BIN): $(BUILDDIR)/libxr.a
+$(BIN): $(LIB)
 	$(CONF_CC) $(PROF) $(CONF_OPTFLAGS) -g -o $(BIN) \
 	  -L$(BUILDDIR) -lxr $(CONF_LIB)
 
diff --git a/xr/netbuffer/netread.cc b/xr/netbuffer/netread.cc
@@ -4,9 +4,12 @@
 unsigned Netbuffer::netread (Socket &s, unsigned timeout) {
     PROFILE("Netbuffer::netread");
 
+    // debugmsg("Reading from fd " << s.fd() << ", timeout "
+    //           << timeout << "\n");
     if (timeout) {
 	Fdset set(timeout);
 	set.add(s);
+	set.wait_r();
 	if (! set.readable(s)) {
 	    msg("Fd "<< s.fd() << " failed to become readable within " <<
 		timeout << " sec\n");