Bump version: 1.7.0.1-fc0c → 1.7.1

Change-Id: Ia9d48cb2b878946df5809bac53c2bd2905903a58

debian/changelog

@@ -1,3 +1,10 @@
+osmo-sgsn (1.7.1) unstable; urgency=medium
+
+  * gtphub: remove llist_first, llist_last macros
+  * debian/control: remove dh-systemd build-depend
+
+ -- Oliver Smith <osmith@sysmocom.de>  Mon, 06 Sep 2021 17:07:35 +0200
+
 osmo-sgsn (1.7.0) unstable; urgency=medium
 
   [ Daniel Willmann ]

debian/control

@@ -4,7 +4,6 @@ Priority: extra
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Build-Depends: debhelper (>=9),
                dh-autoreconf,
-               dh-systemd (>= 1.5),
                autotools-dev,
                autoconf,
                automake,

src/gtphub/gtphub.c

@@ -59,15 +59,6 @@ void *osmo_gtphub_ctx;
 /* TODO move this to osmocom/core/select.h ? */
 typedef int (*osmo_fd_cb_t)(struct osmo_fd *fd, unsigned int what);
 
-/* TODO move this to osmocom/core/linuxlist.h ? */
-#define __llist_first(head) (((head)->next == (head)) ? NULL : (head)->next)
-#define llist_first(head, type, entry) \
-	llist_entry(__llist_first(head), type, entry)
-
-#define __llist_last(head) (((head)->next == (head)) ? NULL : (head)->prev)
-#define llist_last(head, type, entry) \
-	llist_entry(__llist_last(head), type, entry)
-
 /* TODO move GTP header stuff to openggsn/gtp/ ? See gtp_decaps*() */
 
 enum gtp_rc {
@@ -613,7 +604,7 @@ void expiry_add(struct expiry *exq, struct expiring_item *item, time_t now)
 
 	OSMO_ASSERT(llist_empty(&exq->items)
 		    || (item->expiry
-			>= llist_last(&exq->items, struct expiring_item, entry)->expiry));
+			>= llist_last_entry(&exq->items, struct expiring_item, entry)->expiry));
 
 	/* Add/move to the tail to always sort by expiry, ascending. */
 	llist_del(&item->entry);
@@ -1142,9 +1133,7 @@ static const char *gtphub_peer_strb(struct gtphub_peer *peer, char *buf,
 	if (llist_empty(&peer->addresses))
 		return "(addressless)";
 
-	struct gtphub_peer_addr *a = llist_first(&peer->addresses,
-						 struct gtphub_peer_addr,
-						 entry);
+	struct gtphub_peer_addr *a = llist_first_entry_or_null(&peer->addresses, struct gtphub_peer_addr, entry);
 	return gsn_addr_to_strb(&a->addr, buf, buflen);
 }