Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package clknetsim for openSUSE:Factory
checked in at 2023-09-12 21:03:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clknetsim (Old)
and /work/SRC/openSUSE:Factory/.clknetsim.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clknetsim"
Tue Sep 12 21:03:44 2023 rev:2 rq:1110463 version:0+git.20230905
Changes:
--------
--- /work/SRC/openSUSE:Factory/clknetsim/clknetsim.changes 2023-06-27
23:17:55.755837429 +0200
+++ /work/SRC/openSUSE:Factory/.clknetsim.new.1766/clknetsim.changes
2023-09-12 21:04:53.464472384 +0200
@@ -1,0 +2,8 @@
+Tue Sep 12 08:04:17 UTC 2023 - Martin Pluskal <mplus...@suse.com>
+
+- Update to version 0+git.20230905:
+ * fix compatibility with old make
+ * save message in select() if fd is not polled
+ * don't read /usr/include/sys/time.h directly
+
+-------------------------------------------------------------------
Old:
----
clknetsim-0+git.20230612.obscpio
New:
----
clknetsim-0+git.20230905.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clknetsim.spec ++++++
--- /var/tmp/diff_new_pack.FCy0B0/_old 2023-09-12 21:04:54.680515760 +0200
+++ /var/tmp/diff_new_pack.FCy0B0/_new 2023-09-12 21:04:54.684515902 +0200
@@ -17,7 +17,7 @@
Name: clknetsim
-Version: 0+git.20230612
+Version: 0+git.20230905
Release: 0
Summary: Clock and Network Simulator
License: GPL-2.0-only
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FCy0B0/_old 2023-09-12 21:04:54.720517186 +0200
+++ /var/tmp/diff_new_pack.FCy0B0/_new 2023-09-12 21:04:54.720517186 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/mlichvar/clknetsim.git</param>
- <param
name="changesrevision">ef2a7a92b05bbefcacaf3ec4e265fd22c098d602</param></service></servicedata>
+ <param
name="changesrevision">a60048232932409ee24aadaa4bceba43325a2f69</param></service></servicedata>
(No newline at EOF)
++++++ clknetsim-0+git.20230612.obscpio -> clknetsim-0+git.20230905.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/clknetsim-0+git.20230612/Makefile
new/clknetsim-0+git.20230905/Makefile
--- old/clknetsim-0+git.20230612/Makefile 2023-06-12 10:50:01.000000000
+0200
+++ new/clknetsim-0+git.20230905/Makefile 2023-09-05 11:03:14.000000000
+0200
@@ -4,7 +4,8 @@
all: clknetsim.so clknetsim
-apiflags := $(shell grep -q __timezone_ptr_t /usr/include/sys/time.h || echo
-DGETTIMEOFDAY_VOID)
+apiflags := $(shell echo -e '\x23include <sys/time.h>' | $(CC) -x c -E - | \
+ grep __timezone_ptr_t > /dev/null || echo -DGETTIMEOFDAY_VOID)
clientobjs = client.o
serverobjs = $(patsubst %.cc,%.o,$(wildcard *.cc))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/clknetsim-0+git.20230612/client.c
new/clknetsim-0+git.20230905/client.c
--- old/clknetsim-0+git.20230612/client.c 2023-06-12 10:50:01.000000000
+0200
+++ new/clknetsim-0+git.20230905/client.c 2023-09-05 11:03:14.000000000
+0200
@@ -161,7 +161,7 @@
char data[MAX_PACKET_SIZE];
unsigned int len;
unsigned int subnet;
- unsigned int to;
+ unsigned int to_from;
unsigned int port;
};
@@ -1227,11 +1227,21 @@
struct Reply_recv recv_rep;
make_request(REQ_RECV, NULL, 0, &recv_rep,
sizeof (recv_rep));
- if (rep.ret != REPLY_SELECT_BROADCAST)
- fprintf(stderr, "clknetsim: dropped
packet of type %d from "
- "node %d on port %d in
subnet %d\n",
- recv_rep.type,
recv_rep.from + 1,
- recv_rep.dst_port,
recv_rep.subnet + 1);
+ if (rep.ret != REPLY_SELECT_BROADCAST) {
+ if (s >= 0 && sockets[s].buffer.len ==
0) {
+ sockets[s].buffer.len =
recv_rep.len;
+ assert(sockets[s].buffer.len <=
sizeof (sockets[s].buffer.data));
+ memcpy(sockets[s].buffer.data,
recv_rep.data, sockets[s].buffer.len);
+ sockets[s].buffer.subnet =
recv_rep.subnet;
+ sockets[s].buffer.to_from =
recv_rep.from;
+ sockets[s].buffer.port =
recv_rep.src_port;
+ } else {
+ fprintf(stderr, "clknetsim:
dropped packet of type %d from "
+ "node %d on
port %d in subnet %d\n",
+ recv_rep.type,
recv_rep.from + 1,
+
recv_rep.dst_port, recv_rep.subnet + 1);
+ }
+ }
goto try_again;
}
@@ -2306,7 +2316,7 @@
memcpy(last_ts_msg->data, req.data, req.len);
last_ts_msg->len = req.len;
last_ts_msg->subnet = req.subnet;
- last_ts_msg->to = req.to;
+ last_ts_msg->to_from = req.to;
last_ts_msg->port = req.dst_port;
}
@@ -2398,13 +2408,13 @@
assert(sockets[s].type == SOCK_DGRAM);
rep.type = MSG_TYPE_UDP_DATA;
rep.subnet = last_ts_msg->subnet;
- rep.from = last_ts_msg->to;
+ rep.from = last_ts_msg->to_from;
rep.src_port = last_ts_msg->port;
rep.dst_port = sockets[s].port;
/* put the message in an Ethernet frame */
rep.len = generate_eth_frame(sockets[s].type,
last_ts_msg->subnet,
- node, last_ts_msg->to,
+ node, last_ts_msg->to_from,
sockets[s].port, last_ts_msg->port,
last_ts_msg->data,
last_ts_msg->len,
rep.data, sizeof (rep.data));
@@ -2412,14 +2422,24 @@
last_ts_msg->len = 0;
} else if (sockets[s].buffer.len > 0) {
- assert(sockets[s].type == SOCK_STREAM && sockets[s].remote_node
!= -1);
+ switch (sockets[s].type) {
+ case SOCK_STREAM:
+ assert(sockets[s].remote_node != -1);
+ rep.type = MSG_TYPE_TCP_DATA;
+ break;
+ case SOCK_DGRAM:
+ rep.type = MSG_TYPE_UDP_DATA;
+ break;
+ default:
+ assert(0);
+ }
+
assert(sockets[s].buffer.len <= sizeof (rep.data));
memcpy(rep.data, sockets[s].buffer.data, sockets[s].buffer.len);
- rep.type = MSG_TYPE_TCP_DATA;
- rep.subnet = sockets[s].iface - IFACE_ETH0;
- rep.from = sockets[s].remote_node;
- rep.src_port = sockets[s].remote_port;
+ rep.subnet = sockets[s].buffer.subnet;
+ rep.from = sockets[s].buffer.to_from;
+ rep.src_port = sockets[s].buffer.port;
rep.dst_port = sockets[s].port;
rep.len = sockets[s].buffer.len;
@@ -2488,13 +2508,16 @@
memcpy(msg->msg_iov[0].iov_base, rep.data, msglen);
if (sockets[s].type == SOCK_STREAM) {
- if (msglen < rep.len) {
- sockets[s].buffer.len = rep.len - msglen;
- assert(sockets[s].buffer.len <= sizeof
(sockets[s].buffer.data));
- memcpy(sockets[s].buffer.data, rep.data + msglen,
rep.len - msglen);
- } else {
- sockets[s].buffer.len = 0;
- }
+ if (msglen < rep.len) {
+ sockets[s].buffer.len = rep.len - msglen;
+ assert(sockets[s].buffer.len <= sizeof
(sockets[s].buffer.data));
+ memcpy(sockets[s].buffer.data, rep.data + msglen,
rep.len - msglen);
+ sockets[s].buffer.subnet = rep.subnet;
+ sockets[s].buffer.to_from = rep.from;
+ sockets[s].buffer.port = rep.src_port;
+ } else {
+ sockets[s].buffer.len = 0;
+ }
}
cmsglen = 0;
++++++ clknetsim.obsinfo ++++++
--- /var/tmp/diff_new_pack.FCy0B0/_old 2023-09-12 21:04:54.828521039 +0200
+++ /var/tmp/diff_new_pack.FCy0B0/_new 2023-09-12 21:04:54.832521181 +0200
@@ -1,5 +1,5 @@
name: clknetsim
-version: 0+git.20230612
-mtime: 1686559801
-commit: ef2a7a92b05bbefcacaf3ec4e265fd22c098d602
+version: 0+git.20230905
+mtime: 1693904594
+commit: a60048232932409ee24aadaa4bceba43325a2f69
