Page MenuHomeFreeBSD
Files F110993868

D36775.diff
No OneTemporary
Actions

D36775.diff
View Options

Index: sys/net/pfkeyv2.h
===================================================================
--- sys/net/pfkeyv2.h
+++ sys/net/pfkeyv2.h
@@ -85,7 +85,6 @@
u_int8_t sadb_msg_errno;
u_int8_t sadb_msg_satype;
u_int16_t sadb_msg_len;
- u_int16_t sadb_msg_reserved;
u_int32_t sadb_msg_seq;
u_int32_t sadb_msg_pid;
};
Index: sys/netipsec/key.c
===================================================================
--- sys/netipsec/key.c
+++ sys/netipsec/key.c
@@ -663,7 +663,7 @@
static struct mbuf *key_setdumpsa(struct secasvar *, u_int8_t,
u_int8_t, u_int32_t, u_int32_t);
static struct mbuf *key_setsadbmsg(u_int8_t, u_int16_t, u_int8_t,
- u_int32_t, pid_t, u_int16_t);
+ u_int32_t, pid_t);
static struct mbuf *key_setsadbsa(struct secasvar *);
static struct mbuf *key_setsadbaddr(u_int16_t,
const struct sockaddr *, u_int8_t, u_int16_t);
@@ -2481,7 +2481,7 @@
}
/* create new sadb_msg to reply. */
- m = key_setsadbmsg(SADB_X_SPDACQUIRE, 0, 0, 0, 0, 0);
+ m = key_setsadbmsg(SADB_X_SPDACQUIRE, 0, 0, 0, 0);
if (!m)
return ENOBUFS;
@@ -2656,7 +2656,7 @@
struct mbuf *result = NULL, *m;
struct seclifetime lt;
- m = key_setsadbmsg(type, 0, SADB_SATYPE_UNSPEC, seq, pid, sp->refcnt);
+ m = key_setsadbmsg(type, 0, SADB_SATYPE_UNSPEC, seq, pid);
if (!m)
goto fail;
result = m;
@@ -2766,7 +2766,7 @@
KEYDBG(KEY_DATA, kdebug_secpolicy(sp));
/* set msg header */
- m = key_setsadbmsg(SADB_X_SPDEXPIRE, 0, 0, 0, 0, 0);
+ m = key_setsadbmsg(SADB_X_SPDEXPIRE, 0, 0, 0, 0);
if (!m) {
error = ENOBUFS;
goto fail;
@@ -3585,7 +3585,7 @@
SECASVAR_RLOCK_TRACKER;
- m = key_setsadbmsg(type, 0, satype, seq, pid, sav->refcnt);
+ m = key_setsadbmsg(type, 0, satype, seq, pid);
if (m == NULL)
goto fail;
result = m;
@@ -3773,7 +3773,7 @@
*/
static struct mbuf *
key_setsadbmsg(u_int8_t type, u_int16_t tlen, u_int8_t satype, u_int32_t seq,
- pid_t pid, u_int16_t reserved)
+ pid_t pid)
{
struct mbuf *m;
struct sadb_msg *p;
@@ -3802,7 +3802,6 @@
p->sadb_msg_errno = 0;
p->sadb_msg_satype = satype;
p->sadb_msg_len = PFKEY_UNIT64(tlen);
- p->sadb_msg_reserved = reserved;
p->sadb_msg_seq = seq;
p->sadb_msg_pid = (u_int32_t)pid;
@@ -6610,7 +6609,7 @@
if (seq == 0)
return (error);
- m = key_setsadbmsg(SADB_ACQUIRE, 0, satype, seq, 0, 0);
+ m = key_setsadbmsg(SADB_ACQUIRE, 0, satype, seq, 0);
if (!m) {
error = ENOBUFS;
goto fail;
@@ -7326,7 +7325,7 @@
/* set msg header */
satype = key_proto2satype(sav->sah->saidx.proto);
IPSEC_ASSERT(satype != 0, ("invalid proto, satype %u", satype));
- m = key_setsadbmsg(SADB_EXPIRE, 0, satype, sav->seq, 0, sav->refcnt);
+ m = key_setsadbmsg(SADB_EXPIRE, 0, satype, sav->seq, 0);
if (!m) {
error = ENOBUFS;
goto fail;
Index: sys/netipsec/key_debug.c
===================================================================
--- sys/netipsec/key_debug.c
+++ sys/netipsec/key_debug.c
@@ -178,9 +178,9 @@
base->sadb_msg_version, base->sadb_msg_type,
kdebug_sadb_type(base->sadb_msg_type),
base->sadb_msg_errno, base->sadb_msg_satype);
- printf(" len=%u reserved=%u seq=%u pid=%u\n",
- base->sadb_msg_len, base->sadb_msg_reserved,
- base->sadb_msg_seq, base->sadb_msg_pid);
+ printf(" len=%u seq=%u pid=%u\n",
+ base->sadb_msg_len, base->sadb_msg_seq,
+ base->sadb_msg_pid);
tlen = PFKEY_UNUNIT64(base->sadb_msg_len) - sizeof(struct sadb_msg);
ext = (struct sadb_ext *)((caddr_t)base + sizeof(struct sadb_msg));

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 26, 10:31 PM (14 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16858883
Default Alt Text
D36775.diff (3 KB)

Event Timeline