[MERGED] osmo-ggsn[master]: lib/tun: Remove tun_setaddr() API, as everyone is using tun_...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: lib/tun: Remove tun_setaddr() API, as everyone is using tun_addaddr() now
......................................................................


lib/tun: Remove tun_setaddr() API, as everyone is using tun_addaddr() now

Change-Id: I02e057d30b6773c17ea6bc31094e53587971e9e7
---
M lib/tun.c
M lib/tun.h
2 files changed, 0 insertions(+), 17 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/lib/tun.c b/lib/tun.c
index 122d38c..6498945 100644
--- a/lib/tun.c
+++ b/lib/tun.c
@@ -97,20 +97,6 @@
 	return rc;
 }
 
-int tun_setaddr(struct tun_t *this, struct in46_addr *addr, struct in46_addr *dstaddr, size_t prefixlen)
-{
-	struct in_addr netmask;
-	switch (addr->len) {
-	case 4:
-		netmask.s_addr = htonl(0xffffffff << (32 - prefixlen));
-		return tun_setaddr4(this, &addr->v4, dstaddr ? &dstaddr->v4 : NULL, &netmask);
-	case 16:
-		return tun_setaddr6(this, &addr->v6, dstaddr ? &dstaddr->v6 : NULL, prefixlen);
-	default:
-		return -1;
-	}
-}
-
 static int tun_addaddr4(struct tun_t *this, struct in_addr *addr,
 			struct in_addr *dstaddr, struct in_addr *netmask)
 {
diff --git a/lib/tun.h b/lib/tun.h
index c9e8e34..e41ee69 100644
--- a/lib/tun.h
+++ b/lib/tun.h
@@ -49,9 +49,6 @@
 extern int tun_addaddr(struct tun_t *this, struct in46_addr *addr,
 		       struct in46_addr *dstaddr, size_t prefixlen);
 
-extern int tun_setaddr(struct tun_t *this, struct in46_addr *our_adr,
-		       struct in46_addr *his_adr, size_t prefixlen);
-
 extern int tun_set_cb_ind(struct tun_t *this,
 			  int (*cb_ind) (struct tun_t * tun, void *pack,
 					 unsigned len));

-- 
To view, visit https://gerrit.osmocom.org/7927
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I02e057d30b6773c17ea6bc31094e53587971e9e7
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>