lib/tun: Remove tun_setaddr() API, as everyone is using tun_addaddr() now
Change-Id: I02e057d30b6773c17ea6bc31094e53587971e9e7
This commit is contained in:
parent
31e1dab2c0
commit
9eebe15cd1
14
lib/tun.c
14
lib/tun.c
|
@ -97,20 +97,6 @@ static int tun_setaddr6(struct tun_t *this, struct in6_addr *addr, struct in6_ad
|
||||||
return rc;
|
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,
|
static int tun_addaddr4(struct tun_t *this, struct in_addr *addr,
|
||||||
struct in_addr *dstaddr, struct in_addr *netmask)
|
struct in_addr *dstaddr, struct in_addr *netmask)
|
||||||
{
|
{
|
||||||
|
|
|
@ -49,9 +49,6 @@ extern int tun_encaps(struct tun_t *tun, void *pack, unsigned len);
|
||||||
extern int tun_addaddr(struct tun_t *this, struct in46_addr *addr,
|
extern int tun_addaddr(struct tun_t *this, struct in46_addr *addr,
|
||||||
struct in46_addr *dstaddr, size_t prefixlen);
|
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,
|
extern int tun_set_cb_ind(struct tun_t *this,
|
||||||
int (*cb_ind) (struct tun_t * tun, void *pack,
|
int (*cb_ind) (struct tun_t * tun, void *pack,
|
||||||
unsigned len));
|
unsigned len));
|
||||||
|
|
Loading…
Reference in New Issue