From 1fe597981c105bc3d1c9a38443e66ae6d61f2374 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 11 Dec 2023 08:08:17 +0000
Subject:  Prepare for 2.14.1.0; add socket_sendnb46_g and socket_recvnb46_g

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 Makefile                 | 2 +-
 NEWS                     | 6 ++++++
 doc/index.html           | 2 +-
 doc/license.html         | 2 +-
 doc/upgrade.html         | 7 +++++++
 package/info             | 2 +-
 src/headers/ip46-header  | 1 +
 src/headers/ip46-with    | 2 ++
 src/headers/ip46-without | 2 ++
 9 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9608d0a..812438e 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,7 @@ src/include/$(package)/uint64.h: $(sysdeps)/sysdeps src/headers/uint64-bswap src
 src/include/$(package)/types.h: src/include/$(package)/uint16.h src/include/$(package)/uint32.h src/include/$(package)/uint64.h $(sysdeps)/sysdeps src/headers/types-header src/headers/types-footer src/headers/unsigned-template src/headers/signed-template
 	exec tools/gen-types.sh $(sysdeps)/sysdeps $(TYPES) > $@
 
-src/include/$(package)/ip46.h: src/include/$(package)/fmtscan.h src/include/$(package)/socket.h $(sysdeps)/sysdeps src/headers/ip46-header src/headers/ip46-footer src/headers/ip46-with src/headers/ip46-without
+src/include/$(package)/ip46.h: src/include/$(package)/fmtscan.h src/include/$(package)/tai.h src/include/$(package)/socket.h $(sysdeps)/sysdeps src/headers/ip46-header src/headers/ip46-footer src/headers/ip46-with src/headers/ip46-without
 	@{ \
 	  cat src/headers/ip46-header ; \
 	  if $(ipv6) && grep -qF 'ipv6: yes' $(sysdeps)/sysdeps ; then cat src/headers/ip46-with ; \
diff --git a/NEWS b/NEWS
index b9e080f..0e2deb4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for skalibs.
 
+In 2.14.1.0
+-----------
+
+ - New socket_sendnb46_g() and socket_recvnb46_g() macros.
+
+
 In 2.14.0.1
 -----------
 
diff --git a/doc/index.html b/doc/index.html
index aa52de9..1f6b190 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,7 +60,7 @@ with a standard C development environment </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of skalibs is <a href="skalibs-2.14.0.1.tar.gz">2.14.0.1</a>. </li>
+ <li> The current released version of skalibs is <a href="skalibs-2.14.1.0.tar.gz">2.14.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/skalibs/">skalibs
 git repository</a>:
diff --git a/doc/license.html b/doc/license.html
index 4d9df3d..d5bd567 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -74,7 +74,7 @@ color, or different text font. </li>
 <p>
  <em>I am aware that the previous restrictions sound completely
 ridiculous while the official skalibs documentation is incomplete.
-As of 2.14.0.1, I'm not going to enforce those restrictions, but if you're
+As of 2.14.1.0, I'm not going to enforce those restrictions, but if you're
 going to provide documentation for skalibs, don't keep it to yourself,
 please send it to me instead. :-) </em>
 </p>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 767feda..72c7d21 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -16,6 +16,13 @@
 <a href="//skarnet.org/">skarnet.org</a>
 </p>
 
+<h2> in 2.14.1.0 </h2>
+
+<ul>
+ <li> New <tt>ip46.h</tt> macros:
+<tt>socket_sendnb46_g()</tt> and <tt>socket_recvnb46_g()</tt> </li>
+</ul>
+
 <h2> in 2.14.0.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 9a16833..15b7c76 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=skalibs
-version=2.14.0.1
+version=2.14.1.0
 category=prog
 package_macro_name=SKALIBS
diff --git a/src/headers/ip46-header b/src/headers/ip46-header
index 82c5e81..49936a7 100644
--- a/src/headers/ip46-header
+++ b/src/headers/ip46-header
@@ -8,6 +8,7 @@
 #include <errno.h>
 
 #include <skalibs/fmtscan.h>
+#include <skalibs/tai.h>
 #include <skalibs/socket.h>
 
 #define IP46_FMT IP6_FMT
diff --git a/src/headers/ip46-with b/src/headers/ip46-with
index 29f0dd0..5eec291 100644
--- a/src/headers/ip46-with
+++ b/src/headers/ip46-with
@@ -34,4 +34,6 @@ extern int socket_local46 (int, ip46 *, uint16_t *) ;
 extern int socket_remote46 (int, ip46 *, uint16_t *) ;
 
 #define socket_recvnb46(fd, buf, len, i, port, deadline, stamp) ((i)->is6 ? socket_recvnb6(fd, buf, len, (i)->ip, port, deadline, stamp) : socket_recvnb4(fd, buf, len, (i)->ip, port, deadline, stamp))
+#define socket_recvnb46_g(fd, buf, len, i, port, deadline) socket_recvnb46(fd, buf, len, i, port, (deadline), &STAMP)
 #define socket_sendnb46(fd, buf, len, i, port, deadline, stamp) ((i)->is6 ? socket_sendnb6(fd, buf, len, (i)->ip, port, deadline, stamp) : socket_sendnb4(fd, buf, len, (i)->ip, port, deadline, stamp))
+#define socket_sendnb46_g(fd, buf, len, i, port, deadline) socket_sendnb46(fd, buf, len, i, port, (deadline), &STAMP)
diff --git a/src/headers/ip46-without b/src/headers/ip46-without
index 9d224e1..5f332db 100644
--- a/src/headers/ip46-without
+++ b/src/headers/ip46-without
@@ -38,4 +38,6 @@ struct ip46_s
 #define socket_remote46(fd, i, port) socket_remote4(fd, (i)->ip, port)
 
 #define socket_recvnb46(fd, buf, len, i, port, deadline, stamp) socket_recvnb4(fd, buf, len, (i)->ip, port, deadline, stamp)
+#define socket_recvnb46_g(fd, buf, len, i, port, deadline) socket_recvnb46(fd, buf, len, i, port, (deadline), &STAMP)
 #define socket_sendnb46(fd, buf, len, i, port, deadline, stamp) socket_sendnb4(fd, buf, len, (i)->ip, port, deadline, stamp)
+#define socket_sendnb46_g(fd, buf, len, i, port, deadline, stamp) socket_sendnb46(fd, buf, len, i, port, (deadline), &STAMP)
-- 
cgit v1.2.3