Skip to content

Commit

Permalink
don't use xxxBYAF.
Browse files Browse the repository at this point in the history
  • Loading branch information
itojun committed May 19, 2000
1 parent 9589961 commit 35ebc49
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 37 deletions.
100 changes: 65 additions & 35 deletions kame/kame/libipsec/pfkey.c
View file
@@ -1,4 +1,4 @@
/* $KAME: pfkey.c,v 1.26 2000/05/07 05:25:03 itojun Exp $ */
/* $KAME: pfkey.c,v 1.27 2000/05/19 11:04:02 itojun Exp $ */

/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
Expand Down Expand Up @@ -221,6 +221,7 @@ pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
int len;
int need_spirange = 0;
caddr_t p;
int plen;

/* validity check */
if (src == NULL || dst == NULL) {
Expand All @@ -235,6 +236,17 @@ pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
__ipsec_errcode = EIPSEC_INVAL_SPI;
return -1;
}
switch (src->sa_family) {
case AF_INET:
plen = sizeof(struct in_addr) << 3;
break;
case AF_INET6:
plen = sizeof(struct in6_addr) << 3;
break;
default:
__ipsec_errcode = EIPSEC_INVAL_FAMILY;
return -1;
}

/* create new sadb_msg to send. */
len = sizeof(struct sadb_msg)
Expand All @@ -257,18 +269,12 @@ pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
len, satype, mode, reqid, seq, getpid());

/* set sadb_address for source */
p = pfkey_setsadbaddr(p,
SADB_EXT_ADDRESS_SRC,
src,
_INALENBYAF(src->sa_family) << 3,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p, SADB_EXT_ADDRESS_SRC, src, plen,
IPSEC_ULPROTO_ANY);

/* set sadb_address for destination */
p = pfkey_setsadbaddr(p,
SADB_EXT_ADDRESS_DST,
dst,
_INALENBYAF(dst->sa_family) << 3,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p, SADB_EXT_ADDRESS_DST, dst, plen,
IPSEC_ULPROTO_ANY);

/* proccessing spi range */
if (need_spirange) {
Expand Down Expand Up @@ -740,6 +746,7 @@ pfkey_send_x1(so, type, satype, mode, src, dst, spi, reqid, wsize,
struct sadb_msg *newmsg;
int len;
caddr_t p;
int plen;

/* validity check */
if (src == NULL || dst == NULL) {
Expand All @@ -750,6 +757,17 @@ pfkey_send_x1(so, type, satype, mode, src, dst, spi, reqid, wsize,
__ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
return -1;
}
switch (src->sa_family) {
case AF_INET:
plen = sizeof(struct in_addr) << 3;
break;
case AF_INET6:
plen = sizeof(struct in6_addr) << 3;
break;
default:
__ipsec_errcode = EIPSEC_INVAL_FAMILY;
return -1;
}

switch (satype) {
case SADB_SATYPE_ESP:
Expand Down Expand Up @@ -798,16 +816,10 @@ pfkey_send_x1(so, type, satype, mode, src, dst, spi, reqid, wsize,
p = pfkey_setsadbmsg((caddr_t)newmsg, type, len,
satype, mode, reqid, seq, getpid());
p = pfkey_setsadbsa(p, spi, wsize, a_type, e_type, flags);
p = pfkey_setsadbaddr(p,
SADB_EXT_ADDRESS_SRC,
src,
_INALENBYAF(src->sa_family) << 3,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p,
SADB_EXT_ADDRESS_DST,
dst,
_INALENBYAF(dst->sa_family) << 3,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p, SADB_EXT_ADDRESS_SRC, src, plen,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p, SADB_EXT_ADDRESS_DST, dst, plen,
IPSEC_ULPROTO_ANY);

if (e_type != SADB_EALG_NONE)
p = pfkey_setsadbkey(p, SADB_EXT_KEY_ENCRYPT,
Expand Down Expand Up @@ -844,6 +856,7 @@ pfkey_send_x2(so, type, satype, mode, src, dst, spi)
struct sadb_msg *newmsg;
int len;
caddr_t p;
int plen;

/* validity check */
if (src == NULL || dst == NULL) {
Expand All @@ -854,6 +867,17 @@ pfkey_send_x2(so, type, satype, mode, src, dst, spi)
__ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
return -1;
}
switch (src->sa_family) {
case AF_INET:
plen = sizeof(struct in_addr) << 3;
break;
case AF_INET6:
plen = sizeof(struct in6_addr) << 3;
break;
default:
__ipsec_errcode = EIPSEC_INVAL_FAMILY;
return -1;
}

/* create new sadb_msg to reply. */
len = sizeof(struct sadb_msg)
Expand All @@ -870,16 +894,10 @@ pfkey_send_x2(so, type, satype, mode, src, dst, spi)

p = pfkey_setsadbmsg((caddr_t)newmsg, type, len, satype, mode, 0, 0, getpid());
p = pfkey_setsadbsa(p, spi, 0, 0, 0, 0);
p = pfkey_setsadbaddr(p,
SADB_EXT_ADDRESS_SRC,
src,
_INALENBYAF(src->sa_family) << 3,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p,
SADB_EXT_ADDRESS_DST,
dst,
_INALENBYAF(dst->sa_family) << 3,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p, SADB_EXT_ADDRESS_SRC, src, plen,
IPSEC_ULPROTO_ANY);
p = pfkey_setsadbaddr(p, SADB_EXT_ADDRESS_DST, dst, plen,
IPSEC_ULPROTO_ANY);

/* send message */
len = pfkey_send(so, newmsg, len);
Expand Down Expand Up @@ -959,6 +977,7 @@ pfkey_send_x4(so, type, src, prefs, dst, prefd, proto, policy, policylen, seq)
struct sadb_msg *newmsg;
int len;
caddr_t p;
int plen;

/* validity check */
if (src == NULL || dst == NULL) {
Expand All @@ -969,18 +988,29 @@ pfkey_send_x4(so, type, src, prefs, dst, prefd, proto, policy, policylen, seq)
__ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
return -1;
}
if (prefs > (_INALENBYAF(src->sa_family) << 3)
|| prefd > (_INALENBYAF(dst->sa_family) << 3)) {

switch (src->sa_family) {
case AF_INET:
plen = sizeof(struct in_addr) << 3;
break;
case AF_INET6:
plen = sizeof(struct in6_addr) << 3;
break;
default:
__ipsec_errcode = EIPSEC_INVAL_FAMILY;
return -1;
}
if (prefs > plen || prefd > plen) {
__ipsec_errcode = EIPSEC_INVAL_PREFIXLEN;
return -1;
}

/* create new sadb_msg to reply. */
len = sizeof(struct sadb_msg)
+ sizeof(struct sadb_address)
+ PFKEY_ALIGN8(_SALENBYAF(src->sa_family))
+ PFKEY_ALIGN8(src->sa_len)
+ sizeof(struct sadb_address)
+ PFKEY_ALIGN8(_SALENBYAF(src->sa_family))
+ PFKEY_ALIGN8(src->sa_len)
+ policylen;

if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
Expand Down
16 changes: 14 additions & 2 deletions kame/kame/libipsec/pfkey_dump.c
View file
@@ -1,4 +1,4 @@
/* $KAME: pfkey_dump.c,v 1.15 2000/05/07 05:34:50 itojun Exp $ */
/* $KAME: pfkey_dump.c,v 1.16 2000/05/19 11:04:02 itojun Exp $ */

/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
Expand Down Expand Up @@ -406,8 +406,20 @@ str_prefport(family, pref, port)
static char buf[128];
char prefbuf[10];
char portbuf[10];
int plen;

switch (family) {
case AF_INET:
plen = sizeof(struct in_addr) << 3;
break;
case AF_INET6:
plen = sizeof(struct in6_addr) << 3;
break;
default:
return "?";
}

if (pref == (_INALENBYAF(family) << 3))
if (pref == plen)
prefbuf[0] = '\0';
else
snprintf(prefbuf, sizeof(prefbuf), "/%u", pref);
Expand Down

0 comments on commit 35ebc49

Please sign in to comment.