X-Git-Url: https://git.saurik.com/apple/mdnsresponder.git/blobdiff_plain/4a95efb2b76a7c3a5d05400dff1773abe5adcf54..83fb1e36c79aee7f897e5ff0e6eeed1d9d526a14:/mDNSMacOSX/pfkey.c

diff --git a/mDNSMacOSX/pfkey.c b/mDNSMacOSX/pfkey.c
index 9d75414..839c8d7 100644
--- a/mDNSMacOSX/pfkey.c
+++ b/mDNSMacOSX/pfkey.c
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -77,26 +77,26 @@ static int findsupportedmap __P((int));
 static int setsupportedmap __P((struct sadb_supported *));
 static struct sadb_alg *findsupportedalg __P((u_int, u_int));
 static int pfkey_send_x1 __P((int, u_int, u_int, u_int, struct sockaddr *,
-	struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t,
-	u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t,
-	u_int32_t, u_int32_t, u_int32_t));
+                              struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t,
+                              u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t,
+                              u_int32_t, u_int32_t, u_int32_t));
 static int pfkey_send_x2 __P((int, u_int, u_int, u_int,
-	struct sockaddr *, struct sockaddr *, u_int32_t));
+                              struct sockaddr *, struct sockaddr *, u_int32_t));
 static int pfkey_send_x3 __P((int, u_int, u_int));
 static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int,
-	struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
-	char *, int, u_int32_t));
+                              struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t,
+                              char *, int, u_int32_t));
 static int pfkey_send_x5 __P((int, u_int, u_int32_t));
 
 static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int,
-	u_int, u_int32_t, pid_t));
+                                     u_int, u_int32_t, pid_t));
 static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int,
-	u_int, u_int, u_int32_t));
+                                    u_int, u_int, u_int32_t));
 static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int,
-	struct sockaddr *, u_int, u_int));
+                                      struct sockaddr *, u_int, u_int));
 static caddr_t pfkey_setsadbkey __P((caddr_t, caddr_t, u_int, caddr_t, u_int));
 static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t,
-	u_int32_t, u_int32_t, u_int32_t));
+                                          u_int32_t, u_int32_t, u_int32_t));
 static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t));
 
 /*
@@ -105,90 +105,90 @@ static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t));
 static struct sadb_supported *ipsec_supported[] = { NULL, NULL, NULL, };
 
 static int supported_map[] = {
-	SADB_SATYPE_AH,
-	SADB_SATYPE_ESP,
-	SADB_X_SATYPE_IPCOMP,
+    SADB_SATYPE_AH,
+    SADB_SATYPE_ESP,
+    SADB_X_SATYPE_IPCOMP,
 };
 
 static int
 findsupportedmap(satype)
-	int satype;
+int satype;
 {
-	int i;
+    int i;
 
-	for (i = 0; (unsigned int)i < sizeof(supported_map)/sizeof(supported_map[0]); i++)
-		if (supported_map[i] == satype)
-			return i;
-	return -1;
+    for (i = 0; (unsigned int)i < sizeof(supported_map)/sizeof(supported_map[0]); i++)
+        if (supported_map[i] == satype)
+            return i;
+    return -1;
 }
 
 static struct sadb_alg *
 findsupportedalg(satype, alg_id)
-	u_int satype, alg_id;
+u_int satype, alg_id;
 {
-	int algno;
-	int tlen;
-	caddr_t p;
-
-	/* validity check */
-	algno = findsupportedmap(satype);
-	if (algno == -1) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return NULL;
-	}
-	if (ipsec_supported[algno] == NULL) {
-		__ipsec_errcode = EIPSEC_DO_GET_SUPP_LIST;
-		return NULL;
-	}
-
-	tlen = ipsec_supported[algno]->sadb_supported_len
-		- sizeof(struct sadb_supported);
-	p = (caddr_t)(ipsec_supported[algno] + 1);
-	while (tlen > 0) {
-		if ((unsigned int)tlen < sizeof(struct sadb_alg)) {
-			/* invalid format */
-			break;
-		}
-		if (((struct sadb_alg *)p)->sadb_alg_id == alg_id)
-			return (struct sadb_alg *)p;
-
-		tlen -= sizeof(struct sadb_alg);
-		p += sizeof(struct sadb_alg);
-	}
-
-	__ipsec_errcode = EIPSEC_NOT_SUPPORTED;
-	return NULL;
+    int algno;
+    int tlen;
+    caddr_t p;
+
+    /* validity check */
+    algno = findsupportedmap(satype);
+    if (algno == -1) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return NULL;
+    }
+    if (ipsec_supported[algno] == NULL) {
+        __ipsec_errcode = EIPSEC_DO_GET_SUPP_LIST;
+        return NULL;
+    }
+
+    tlen = ipsec_supported[algno]->sadb_supported_len
+           - sizeof(struct sadb_supported);
+    p = (caddr_t)(ipsec_supported[algno] + 1);
+    while (tlen > 0) {
+        if ((unsigned int)tlen < sizeof(struct sadb_alg)) {
+            /* invalid format */
+            break;
+        }
+        if (((struct sadb_alg *)p)->sadb_alg_id == alg_id)
+            return (struct sadb_alg *)p;
+
+        tlen -= sizeof(struct sadb_alg);
+        p += sizeof(struct sadb_alg);
+    }
+
+    __ipsec_errcode = EIPSEC_NOT_SUPPORTED;
+    return NULL;
 }
 
 static int
 setsupportedmap(sup)
-	struct sadb_supported *sup;
+struct sadb_supported *sup;
 {
-	struct sadb_supported **ipsup;
-
-	switch (sup->sadb_supported_exttype) {
-	case SADB_EXT_SUPPORTED_AUTH:
-		ipsup = &ipsec_supported[findsupportedmap(SADB_SATYPE_AH)];
-		break;
-	case SADB_EXT_SUPPORTED_ENCRYPT:
-		ipsup = &ipsec_supported[findsupportedmap(SADB_SATYPE_ESP)];
-		break;
-	default:
-		__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-		return -1;
-	}
-
-	if (*ipsup)
-		free(*ipsup);
-
-	*ipsup = malloc(sup->sadb_supported_len);
-	if (!*ipsup) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	memcpy(*ipsup, sup, sup->sadb_supported_len);
-
-	return 0;
+    struct sadb_supported **ipsup;
+
+    switch (sup->sadb_supported_exttype) {
+    case SADB_EXT_SUPPORTED_AUTH:
+        ipsup = &ipsec_supported[findsupportedmap(SADB_SATYPE_AH)];
+        break;
+    case SADB_EXT_SUPPORTED_ENCRYPT:
+        ipsup = &ipsec_supported[findsupportedmap(SADB_SATYPE_ESP)];
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    if (*ipsup)
+        free(*ipsup);
+
+    *ipsup = malloc(sup->sadb_supported_len);
+    if (!*ipsup) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    memcpy(*ipsup, sup, sup->sadb_supported_len);
+
+    return 0;
 }
 
 /*
@@ -202,26 +202,26 @@ setsupportedmap(sup)
  */
 int
 ipsec_check_keylen(supported, alg_id, keylen)
-	u_int supported;
-	u_int alg_id;
-	u_int keylen;
+u_int supported;
+u_int alg_id;
+u_int keylen;
 {
-	int satype;
-
-	/* validity check */
-	switch (supported) {
-	case SADB_EXT_SUPPORTED_AUTH:
-		satype = SADB_SATYPE_AH;
-		break;
-	case SADB_EXT_SUPPORTED_ENCRYPT:
-		satype = SADB_SATYPE_ESP;
-		break;
-	default:
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-
-	return ipsec_check_keylen2(satype, alg_id, keylen);
+    int satype;
+
+    /* validity check */
+    switch (supported) {
+    case SADB_EXT_SUPPORTED_AUTH:
+        satype = SADB_SATYPE_AH;
+        break;
+    case SADB_EXT_SUPPORTED_ENCRYPT:
+        satype = SADB_SATYPE_ESP;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    return ipsec_check_keylen2(satype, alg_id, keylen);
 }
 
 /*
@@ -234,23 +234,23 @@ ipsec_check_keylen(supported, alg_id, keylen)
  */
 int
 ipsec_check_keylen2(satype, alg_id, keylen)
-	u_int satype;
-	u_int alg_id;
-	u_int keylen;
+u_int satype;
+u_int alg_id;
+u_int keylen;
 {
-	struct sadb_alg *alg;
+    struct sadb_alg *alg;
 
-	alg = findsupportedalg(satype, alg_id);
-	if (!alg)
-		return -1;
+    alg = findsupportedalg(satype, alg_id);
+    if (!alg)
+        return -1;
 
-	if (keylen < alg->sadb_alg_minbits || keylen > alg->sadb_alg_maxbits) {
-		__ipsec_errcode = EIPSEC_INVAL_KEYLEN;
-		return -1;
-	}
+    if (keylen < alg->sadb_alg_minbits || keylen > alg->sadb_alg_maxbits) {
+        __ipsec_errcode = EIPSEC_INVAL_KEYLEN;
+        return -1;
+    }
 
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return 0;
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
 }
 
 /*
@@ -263,38 +263,38 @@ ipsec_check_keylen2(satype, alg_id, keylen)
  */
 int
 ipsec_get_keylen(supported, alg_id, alg0)
-	u_int supported, alg_id;
-	struct sadb_alg *alg0;
+u_int supported, alg_id;
+struct sadb_alg *alg0;
 {
-	struct sadb_alg *alg;
-	u_int satype;
-
-	/* validity check */
-	if (!alg0) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-
-	switch (supported) {
-	case SADB_EXT_SUPPORTED_AUTH:
-		satype = SADB_SATYPE_AH;
-		break;
-	case SADB_EXT_SUPPORTED_ENCRYPT:
-		satype = SADB_SATYPE_ESP;
-		break;
-	default:
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-
-	alg = findsupportedalg(satype, alg_id);
-	if (!alg)
-		return -1;
-
-	memcpy(alg0, alg, sizeof(*alg0));
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return 0;
+    struct sadb_alg *alg;
+    u_int satype;
+
+    /* validity check */
+    if (!alg0) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    switch (supported) {
+    case SADB_EXT_SUPPORTED_AUTH:
+        satype = SADB_SATYPE_AH;
+        break;
+    case SADB_EXT_SUPPORTED_ENCRYPT:
+        satype = SADB_SATYPE_ESP;
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    alg = findsupportedalg(satype, alg_id);
+    if (!alg)
+        return -1;
+
+    memcpy(alg0, alg, sizeof(*alg0));
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
 }
 
 /*
@@ -308,30 +308,30 @@ static u_int soft_lifetime_usetime_rate = PFKEY_SOFT_LIFETIME_RATE;
 
 u_int
 pfkey_set_softrate(type, rate)
-	u_int type, rate;
+u_int type, rate;
 {
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-
-	if (rate > 100 || rate == 0)
-		rate = 100;
-
-	switch (type) {
-	case SADB_X_LIFETIME_ALLOCATIONS:
-		soft_lifetime_allocations_rate = rate;
-		return 0;
-	case SADB_X_LIFETIME_BYTES:
-		soft_lifetime_bytes_rate = rate;
-		return 0;
-	case SADB_X_LIFETIME_ADDTIME:
-		soft_lifetime_addtime_rate = rate;
-		return 0;
-	case SADB_X_LIFETIME_USETIME:
-		soft_lifetime_usetime_rate = rate;
-		return 0;
-	}
-
-	__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-	return 1;
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+
+    if (rate > 100 || rate == 0)
+        rate = 100;
+
+    switch (type) {
+    case SADB_X_LIFETIME_ALLOCATIONS:
+        soft_lifetime_allocations_rate = rate;
+        return 0;
+    case SADB_X_LIFETIME_BYTES:
+        soft_lifetime_bytes_rate = rate;
+        return 0;
+    case SADB_X_LIFETIME_ADDTIME:
+        soft_lifetime_addtime_rate = rate;
+        return 0;
+    case SADB_X_LIFETIME_USETIME:
+        soft_lifetime_usetime_rate = rate;
+        return 0;
+    }
+
+    __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+    return 1;
 }
 
 /*
@@ -340,20 +340,20 @@ pfkey_set_softrate(type, rate)
  */
 u_int
 pfkey_get_softrate(type)
-	u_int type;
+u_int type;
 {
-	switch (type) {
-	case SADB_X_LIFETIME_ALLOCATIONS:
-		return soft_lifetime_allocations_rate;
-	case SADB_X_LIFETIME_BYTES:
-		return soft_lifetime_bytes_rate;
-	case SADB_X_LIFETIME_ADDTIME:
-		return soft_lifetime_addtime_rate;
-	case SADB_X_LIFETIME_USETIME:
-		return soft_lifetime_usetime_rate;
-	}
-
-	return ~0;
+    switch (type) {
+    case SADB_X_LIFETIME_ALLOCATIONS:
+        return soft_lifetime_allocations_rate;
+    case SADB_X_LIFETIME_BYTES:
+        return soft_lifetime_bytes_rate;
+    case SADB_X_LIFETIME_ADDTIME:
+        return soft_lifetime_addtime_rate;
+    case SADB_X_LIFETIME_USETIME:
+        return soft_lifetime_usetime_rate;
+    }
+
+    return ~0;
 }
 
 /*
@@ -364,124 +364,124 @@ pfkey_get_softrate(type)
  */
 int
 pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
-	int so;
-	u_int satype, mode;
-	struct sockaddr *src, *dst;
-	u_int32_t min, max, reqid, seq;
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t min, max, reqid, seq;
 {
-	struct sadb_msg *newmsg;
-	caddr_t ep;
-	int len;
-	int need_spirange = 0;
-	caddr_t p;
-	int plen;
-
-	/* validity check */
-	if (src == NULL || dst == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-	if (src->sa_family != dst->sa_family) {
-		__ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
-		return -1;
-	}
-	if (min > max || (min > 0 && min <= 255)) {
-		__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)
-		+ sizeof(struct sadb_x_sa2)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(src->sa_len)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(dst->sa_len);
-
-	if (min > (u_int32_t)255 && max < (u_int32_t)~0) {
-		need_spirange++;
-		len += sizeof(struct sadb_spirange);
-	}
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_GETSPI,
-	    len, satype, seq, getpid());
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-
-	p = pfkey_setsadbxsa2(p, ep, mode, reqid);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* set sadb_address for source */
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* set sadb_address for destination */
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* proccessing spi range */
-	if (need_spirange) {
-		struct sadb_spirange spirange;
-
-		if (p + sizeof(spirange) > ep) {
-			free(newmsg);
-			return -1;
-		}
-
-		memset(&spirange, 0, sizeof(spirange));
-		spirange.sadb_spirange_len = PFKEY_UNIT64(sizeof(spirange));
-		spirange.sadb_spirange_exttype = SADB_EXT_SPIRANGE;
-		spirange.sadb_spirange_min = min;
-		spirange.sadb_spirange_max = max;
-
-		memcpy(p, &spirange, sizeof(spirange));
-
-		p += sizeof(spirange);
-	}
-	if (p != ep) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    caddr_t ep;
+    int len;
+    int need_spirange = 0;
+    caddr_t p;
+    int plen;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+        return -1;
+    }
+    if (min > max || (min > 0 && min <= 255)) {
+        __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)
+          + sizeof(struct sadb_x_sa2)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len);
+
+    if (min > (u_int32_t)255 && max < (u_int32_t) ~0) {
+        need_spirange++;
+        len += sizeof(struct sadb_spirange);
+    }
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_GETSPI,
+                         len, satype, seq, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    p = pfkey_setsadbxsa2(p, ep, mode, reqid);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* set sadb_address for source */
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* set sadb_address for destination */
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* proccessing spi range */
+    if (need_spirange) {
+        struct sadb_spirange spirange;
+
+        if (p + sizeof(spirange) > ep) {
+            free(newmsg);
+            return -1;
+        }
+
+        memset(&spirange, 0, sizeof(spirange));
+        spirange.sadb_spirange_len = PFKEY_UNIT64(sizeof(spirange));
+        spirange.sadb_spirange_exttype = SADB_EXT_SPIRANGE;
+        spirange.sadb_spirange_min = min;
+        spirange.sadb_spirange_max = max;
+
+        memcpy(p, &spirange, sizeof(spirange));
+
+        p += sizeof(spirange);
+    }
+    if (p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /*
@@ -493,26 +493,26 @@ pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
  */
 int
 pfkey_send_update(so, satype, mode, src, dst, spi, reqid, wsize,
-		keymat, e_type, e_keylen, a_type, a_keylen, flags,
-		l_alloc, l_bytes, l_addtime, l_usetime, seq)
-	int so;
-	u_int satype, mode, wsize;
-	struct sockaddr *src, *dst;
-	u_int32_t spi, reqid;
-	caddr_t keymat;
-	u_int e_type, e_keylen, a_type, a_keylen, flags;
-	u_int32_t l_alloc;
-	u_int64_t l_bytes, l_addtime, l_usetime;
-	u_int32_t seq;
+                  keymat, e_type, e_keylen, a_type, a_keylen, flags,
+                  l_alloc, l_bytes, l_addtime, l_usetime, seq)
+int so;
+u_int satype, mode, wsize;
+struct sockaddr *src, *dst;
+u_int32_t spi, reqid;
+caddr_t keymat;
+u_int e_type, e_keylen, a_type, a_keylen, flags;
+u_int32_t l_alloc;
+u_int64_t l_bytes, l_addtime, l_usetime;
+u_int32_t seq;
 {
-	int len;
-	if ((len = pfkey_send_x1(so, SADB_UPDATE, satype, mode, src, dst, spi,
-			reqid, wsize,
-			keymat, e_type, e_keylen, a_type, a_keylen, flags,
-			l_alloc, l_bytes, l_addtime, l_usetime, seq)) < 0)
-		return -1;
-
-	return len;
+    int len;
+    if ((len = pfkey_send_x1(so, SADB_UPDATE, satype, mode, src, dst, spi,
+                             reqid, wsize,
+                             keymat, e_type, e_keylen, a_type, a_keylen, flags,
+                             l_alloc, l_bytes, l_addtime, l_usetime, seq)) < 0)
+        return -1;
+
+    return len;
 }
 
 /*
@@ -524,26 +524,26 @@ pfkey_send_update(so, satype, mode, src, dst, spi, reqid, wsize,
  */
 int
 pfkey_send_add(so, satype, mode, src, dst, spi, reqid, wsize,
-		keymat, e_type, e_keylen, a_type, a_keylen, flags,
-		l_alloc, l_bytes, l_addtime, l_usetime, seq)
-	int so;
-	u_int satype, mode, wsize;
-	struct sockaddr *src, *dst;
-	u_int32_t spi, reqid;
-	caddr_t keymat;
-	u_int e_type, e_keylen, a_type, a_keylen, flags;
-	u_int32_t l_alloc;
-	u_int64_t l_bytes, l_addtime, l_usetime;
-	u_int32_t seq;
+               keymat, e_type, e_keylen, a_type, a_keylen, flags,
+               l_alloc, l_bytes, l_addtime, l_usetime, seq)
+int so;
+u_int satype, mode, wsize;
+struct sockaddr *src, *dst;
+u_int32_t spi, reqid;
+caddr_t keymat;
+u_int e_type, e_keylen, a_type, a_keylen, flags;
+u_int32_t l_alloc;
+u_int64_t l_bytes, l_addtime, l_usetime;
+u_int32_t seq;
 {
-	int len;
-	if ((len = pfkey_send_x1(so, SADB_ADD, satype, mode, src, dst, spi,
-			reqid, wsize,
-			keymat, e_type, e_keylen, a_type, a_keylen, flags,
-			l_alloc, l_bytes, l_addtime, l_usetime, seq)) < 0)
-		return -1;
-
-	return len;
+    int len;
+    if ((len = pfkey_send_x1(so, SADB_ADD, satype, mode, src, dst, spi,
+                             reqid, wsize,
+                             keymat, e_type, e_keylen, a_type, a_keylen, flags,
+                             l_alloc, l_bytes, l_addtime, l_usetime, seq)) < 0)
+        return -1;
+
+    return len;
 }
 
 /*
@@ -554,16 +554,16 @@ pfkey_send_add(so, satype, mode, src, dst, spi, reqid, wsize,
  */
 int
 pfkey_send_delete(so, satype, mode, src, dst, spi)
-	int so;
-	u_int satype, mode;
-	struct sockaddr *src, *dst;
-	u_int32_t spi;
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi;
 {
-	int len;
-	if ((len = pfkey_send_x2(so, SADB_DELETE, satype, mode, src, dst, spi)) < 0)
-		return -1;
+    int len;
+    if ((len = pfkey_send_x2(so, SADB_DELETE, satype, mode, src, dst, spi)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -577,80 +577,80 @@ pfkey_send_delete(so, satype, mode, src, dst, spi)
  */
 int
 pfkey_send_delete_all(so, satype, mode, src, dst)
-	int so;
-	u_int satype, mode;
-	struct sockaddr *src, *dst;
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
 {
-	struct sadb_msg *newmsg;
-	int len;
-	caddr_t p;
-	int plen;
-	caddr_t ep;
-	
-	(void)mode;
-
-	/* validity check */
-	if (src == NULL || dst == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-	if (src->sa_family != dst->sa_family) {
-		__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)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(src->sa_len)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(dst->sa_len);
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_DELETE, len, satype, 0,
-	    getpid());
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p || p != ep) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    (void)mode;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __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)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_DELETE, len, satype, 0,
+                         getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /*
@@ -661,16 +661,16 @@ pfkey_send_delete_all(so, satype, mode, src, dst)
  */
 int
 pfkey_send_get(so, satype, mode, src, dst, spi)
-	int so;
-	u_int satype, mode;
-	struct sockaddr *src, *dst;
-	u_int32_t spi;
+int so;
+u_int satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi;
 {
-	int len;
-	if ((len = pfkey_send_x2(so, SADB_GET, satype, mode, src, dst, spi)) < 0)
-		return -1;
+    int len;
+    if ((len = pfkey_send_x2(so, SADB_GET, satype, mode, src, dst, spi)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -681,37 +681,37 @@ pfkey_send_get(so, satype, mode, src, dst, spi)
  */
 int
 pfkey_send_register(so, satype)
-	int so;
-	u_int satype;
+int so;
+u_int satype;
 {
-	int len, algno;
-
-	if (satype == PF_UNSPEC) {
-		for (algno = 0;
-		     (unsigned int)algno < sizeof(supported_map)/sizeof(supported_map[0]);
-		     algno++) {
-			if (ipsec_supported[algno]) {
-				free(ipsec_supported[algno]);
-				ipsec_supported[algno] = NULL;
-			}
-		}
-	} else {
-		algno = findsupportedmap(satype);
-		if (algno == -1) {
-			__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-			return -1;
-		}
-
-		if (ipsec_supported[algno]) {
-			free(ipsec_supported[algno]);
-			ipsec_supported[algno] = NULL;
-		}
-	}
-
-	if ((len = pfkey_send_x3(so, SADB_REGISTER, satype)) < 0)
-		return -1;
-
-	return len;
+    int len, algno;
+
+    if (satype == PF_UNSPEC) {
+        for (algno = 0;
+             (unsigned int)algno < sizeof(supported_map)/sizeof(supported_map[0]);
+             algno++) {
+            if (ipsec_supported[algno]) {
+                free(ipsec_supported[algno]);
+                ipsec_supported[algno] = NULL;
+            }
+        }
+    } else {
+        algno = findsupportedmap(satype);
+        if (algno == -1) {
+            __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+            return -1;
+        }
+
+        if (ipsec_supported[algno]) {
+            free(ipsec_supported[algno]);
+            ipsec_supported[algno] = NULL;
+        }
+    }
+
+    if ((len = pfkey_send_x3(so, SADB_REGISTER, satype)) < 0)
+        return -1;
+
+    return len;
 }
 
 /*
@@ -723,29 +723,29 @@ pfkey_send_register(so, satype)
  */
 int
 pfkey_recv_register(so)
-	int so;
+int so;
 {
-	pid_t pid = getpid();
-	struct sadb_msg *newmsg;
-	int error = -1;
+    pid_t pid = getpid();
+    struct sadb_msg *newmsg;
+    int error = -1;
 
-	/* receive message */
-	do {
-		if ((newmsg = pfkey_recv(so)) == NULL)
-			return -1;
-	} while (newmsg->sadb_msg_type != SADB_REGISTER
-	    || (pid_t)newmsg->sadb_msg_pid != pid);
+    /* receive message */
+    do {
+        if ((newmsg = pfkey_recv(so)) == NULL)
+            return -1;
+    } while (newmsg->sadb_msg_type != SADB_REGISTER
+             || (pid_t)newmsg->sadb_msg_pid != pid);
 
-	/* check and fix */
-	newmsg->sadb_msg_len = PFKEY_UNUNIT64(newmsg->sadb_msg_len);
+    /* check and fix */
+    newmsg->sadb_msg_len = PFKEY_UNUNIT64(newmsg->sadb_msg_len);
 
-	error = pfkey_set_supported(newmsg, newmsg->sadb_msg_len);
-	free(newmsg);
+    error = pfkey_set_supported(newmsg, newmsg->sadb_msg_len);
+    free(newmsg);
 
-	if (error == 0)
-		__ipsec_errcode = EIPSEC_NO_ERROR;
+    if (error == 0)
+        __ipsec_errcode = EIPSEC_NO_ERROR;
 
-	return error;
+    return error;
 }
 
 /*
@@ -760,60 +760,60 @@ pfkey_recv_register(so)
  */
 int
 pfkey_set_supported(msg, tlen)
-	struct sadb_msg *msg;
-	int tlen;
+struct sadb_msg *msg;
+int tlen;
 {
-	struct sadb_supported *sup;
-	caddr_t p;
-	caddr_t ep;
-
-	/* validity */
-	if (msg->sadb_msg_len != tlen) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-
-	p = (caddr_t)msg;
-	ep = p + tlen;
-
-	p += sizeof(struct sadb_msg);
-
-	while (p < ep) {
-		sup = (struct sadb_supported *)p;
-		if (ep < p + sizeof(*sup) ||
-		    (size_t)PFKEY_EXTLEN(sup) < sizeof(*sup) ||
-		    ep < p + sup->sadb_supported_len) {
-			/* invalid format */
-			break;
-		}
-
-		switch (sup->sadb_supported_exttype) {
-		case SADB_EXT_SUPPORTED_AUTH:
-		case SADB_EXT_SUPPORTED_ENCRYPT:
-			break;
-		default:
-			__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-			return -1;
-		}
-
-		/* fixed length */
-		sup->sadb_supported_len = PFKEY_EXTLEN(sup);
-
-		/* set supported map */
-		if (setsupportedmap(sup) != 0)
-			return -1;
-
-		p += sup->sadb_supported_len;
-	}
-
-	if (p != ep) {
-		__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-		return -1;
-	}
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-
-	return 0;
+    struct sadb_supported *sup;
+    caddr_t p;
+    caddr_t ep;
+
+    /* validity */
+    if (msg->sadb_msg_len != tlen) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    p = (caddr_t)msg;
+    ep = p + tlen;
+
+    p += sizeof(struct sadb_msg);
+
+    while (p < ep) {
+        sup = (struct sadb_supported *)p;
+        if (ep < p + sizeof(*sup) ||
+            (size_t)PFKEY_EXTLEN(sup) < sizeof(*sup) ||
+            ep < p + sup->sadb_supported_len) {
+            /* invalid format */
+            break;
+        }
+
+        switch (sup->sadb_supported_exttype) {
+        case SADB_EXT_SUPPORTED_AUTH:
+        case SADB_EXT_SUPPORTED_ENCRYPT:
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+
+        /* fixed length */
+        sup->sadb_supported_len = PFKEY_EXTLEN(sup);
+
+        /* set supported map */
+        if (setsupportedmap(sup) != 0)
+            return -1;
+
+        p += sup->sadb_supported_len;
+    }
+
+    if (p != ep) {
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+
+    return 0;
 }
 
 /*
@@ -824,15 +824,15 @@ pfkey_set_supported(msg, tlen)
  */
 int
 pfkey_send_flush(so, satype)
-	int so;
-	u_int satype;
+int so;
+u_int satype;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x3(so, SADB_FLUSH, satype)) < 0)
-		return -1;
+    if ((len = pfkey_send_x3(so, SADB_FLUSH, satype)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -843,15 +843,15 @@ pfkey_send_flush(so, satype)
  */
 int
 pfkey_send_dump(so, satype)
-	int so;
-	u_int satype;
+int so;
+u_int satype;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x3(so, SADB_DUMP, satype)) < 0)
-		return -1;
+    if ((len = pfkey_send_x3(so, SADB_DUMP, satype)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -868,15 +868,15 @@ pfkey_send_dump(so, satype)
  */
 int
 pfkey_send_promisc_toggle(so, flag)
-	int so;
-	int flag;
+int so;
+int flag;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x3(so, SADB_X_PROMISC, (flag ? 1 : 0))) < 0)
-		return -1;
+    if ((len = pfkey_send_x3(so, SADB_X_PROMISC, (flag ? 1 : 0))) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -887,22 +887,22 @@ pfkey_send_promisc_toggle(so, flag)
  */
 int
 pfkey_send_spdadd(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int prefs, prefd, proto;
-	caddr_t policy;
-	int policylen;
-	u_int32_t seq;
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x4(so, SADB_X_SPDADD,
-				src, prefs, dst, prefd, proto,
-				0, 0,
-				policy, policylen, seq)) < 0)
-		return -1;
+    if ((len = pfkey_send_x4(so, SADB_X_SPDADD,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -913,24 +913,24 @@ pfkey_send_spdadd(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
  */
 int
 pfkey_send_spdadd2(so, src, prefs, dst, prefd, proto, ltime, vtime,
-		policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int prefs, prefd, proto;
-	u_int64_t ltime, vtime;
-	caddr_t policy;
-	int policylen;
-	u_int32_t seq;
+                   policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+u_int64_t ltime, vtime;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x4(so, SADB_X_SPDADD,
-				src, prefs, dst, prefd, proto,
-				ltime, vtime,
-				policy, policylen, seq)) < 0)
-		return -1;
+    if ((len = pfkey_send_x4(so, SADB_X_SPDADD,
+                             src, prefs, dst, prefd, proto,
+                             ltime, vtime,
+                             policy, policylen, seq)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -941,22 +941,22 @@ pfkey_send_spdadd2(so, src, prefs, dst, prefd, proto, ltime, vtime,
  */
 int
 pfkey_send_spdupdate(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int prefs, prefd, proto;
-	caddr_t policy;
-	int policylen;
-	u_int32_t seq;
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE,
-				src, prefs, dst, prefd, proto,
-				0, 0,
-				policy, policylen, seq)) < 0)
-		return -1;
+    if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -967,24 +967,24 @@ pfkey_send_spdupdate(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
  */
 int
 pfkey_send_spdupdate2(so, src, prefs, dst, prefd, proto, ltime, vtime,
-		policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int prefs, prefd, proto;
-	u_int64_t ltime, vtime;
-	caddr_t policy;
-	int policylen;
-	u_int32_t seq;
+                      policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+u_int64_t ltime, vtime;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE,
-				src, prefs, dst, prefd, proto,
-				ltime, vtime,
-				policy, policylen, seq)) < 0)
-		return -1;
+    if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE,
+                             src, prefs, dst, prefd, proto,
+                             ltime, vtime,
+                             policy, policylen, seq)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -995,27 +995,27 @@ pfkey_send_spdupdate2(so, src, prefs, dst, prefd, proto, ltime, vtime,
  */
 int
 pfkey_send_spddelete(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int prefs, prefd, proto;
-	caddr_t policy;
-	int policylen;
-	u_int32_t seq;
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
 {
-	int len;
+    int len;
 
-	if (policylen != sizeof(struct sadb_x_policy)) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
+    if (policylen != sizeof(struct sadb_x_policy)) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
 
-	if ((len = pfkey_send_x4(so, SADB_X_SPDDELETE,
-				src, prefs, dst, prefd, proto,
-				0, 0,
-				policy, policylen, seq)) < 0)
-		return -1;
+    if ((len = pfkey_send_x4(so, SADB_X_SPDDELETE,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -1026,15 +1026,15 @@ pfkey_send_spddelete(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
  */
 int
 pfkey_send_spddelete2(so, spid)
-	int so;
-	u_int32_t spid;
+int so;
+u_int32_t spid;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x5(so, SADB_X_SPDDELETE2, spid)) < 0)
-		return -1;
+    if ((len = pfkey_send_x5(so, SADB_X_SPDDELETE2, spid)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -1045,15 +1045,15 @@ pfkey_send_spddelete2(so, spid)
  */
 int
 pfkey_send_spdget(so, spid)
-	int so;
-	u_int32_t spid;
+int so;
+u_int32_t spid;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x5(so, SADB_X_SPDGET, spid)) < 0)
-		return -1;
+    if ((len = pfkey_send_x5(so, SADB_X_SPDGET, spid)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -1064,27 +1064,27 @@ pfkey_send_spdget(so, spid)
  */
 int
 pfkey_send_spdsetidx(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int prefs, prefd, proto;
-	caddr_t policy;
-	int policylen;
-	u_int32_t seq;
+int so;
+struct sockaddr *src, *dst;
+u_int prefs, prefd, proto;
+caddr_t policy;
+int policylen;
+u_int32_t seq;
 {
-	int len;
+    int len;
 
-	if (policylen != sizeof(struct sadb_x_policy)) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
+    if (policylen != sizeof(struct sadb_x_policy)) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
 
-	if ((len = pfkey_send_x4(so, SADB_X_SPDSETIDX,
-				src, prefs, dst, prefd, proto,
-				0, 0,
-				policy, policylen, seq)) < 0)
-		return -1;
+    if ((len = pfkey_send_x4(so, SADB_X_SPDSETIDX,
+                             src, prefs, dst, prefd, proto,
+                             0, 0,
+                             policy, policylen, seq)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -1095,14 +1095,14 @@ pfkey_send_spdsetidx(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
  */
 int
 pfkey_send_spdflush(so)
-	int so;
+int so;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x3(so, SADB_X_SPDFLUSH, SADB_SATYPE_UNSPEC)) < 0)
-		return -1;
+    if ((len = pfkey_send_x3(so, SADB_X_SPDFLUSH, SADB_SATYPE_UNSPEC)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /*
@@ -1113,266 +1113,266 @@ pfkey_send_spdflush(so)
  */
 int
 pfkey_send_spddump(so)
-	int so;
+int so;
 {
-	int len;
+    int len;
 
-	if ((len = pfkey_send_x3(so, SADB_X_SPDDUMP, SADB_SATYPE_UNSPEC)) < 0)
-		return -1;
+    if ((len = pfkey_send_x3(so, SADB_X_SPDDUMP, SADB_SATYPE_UNSPEC)) < 0)
+        return -1;
 
-	return len;
+    return len;
 }
 
 /* sending SADB_ADD or SADB_UPDATE message to the kernel */
 static int
 pfkey_send_x1(so, type, satype, mode, src, dst, spi, reqid, wsize,
-		keymat, e_type, e_keylen, a_type, a_keylen, flags,
-		l_alloc, l_bytes, l_addtime, l_usetime, seq)
-	int so;
-	u_int type, satype, mode;
-	struct sockaddr *src, *dst;
-	u_int32_t spi, reqid;
-	u_int wsize;
-	caddr_t keymat;
-	u_int e_type, e_keylen, a_type, a_keylen, flags;
-	u_int32_t l_alloc, l_bytes, l_addtime, l_usetime, seq;
+              keymat, e_type, e_keylen, a_type, a_keylen, flags,
+              l_alloc, l_bytes, l_addtime, l_usetime, seq)
+int so;
+u_int type, satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi, reqid;
+u_int wsize;
+caddr_t keymat;
+u_int e_type, e_keylen, a_type, a_keylen, flags;
+u_int32_t l_alloc, l_bytes, l_addtime, l_usetime, seq;
 {
-	struct sadb_msg *newmsg;
-	int len;
-	caddr_t p;
-	int plen;
-	caddr_t ep;
-
-	/* validity check */
-	if (src == NULL || dst == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-	if (src->sa_family != dst->sa_family) {
-		__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:
-		if (e_type == SADB_EALG_NONE) {
-			__ipsec_errcode = EIPSEC_NO_ALGS;
-			return -1;
-		}
-		break;
-	case SADB_SATYPE_AH:
-		if (e_type != SADB_EALG_NONE) {
-			__ipsec_errcode = EIPSEC_INVAL_ALGS;
-			return -1;
-		}
-		if (a_type == SADB_AALG_NONE) {
-			__ipsec_errcode = EIPSEC_NO_ALGS;
-			return -1;
-		}
-		break;
-	case SADB_X_SATYPE_IPCOMP:
-		if (e_type == SADB_X_CALG_NONE) {
-			__ipsec_errcode = EIPSEC_INVAL_ALGS;
-			return -1;
-		}
-		if (a_type != SADB_AALG_NONE) {
-			__ipsec_errcode = EIPSEC_NO_ALGS;
-			return -1;
-		}
-		break;
-	default:
-		__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-		return -1;
-	}
-
-	/* create new sadb_msg to reply. */
-	len = sizeof(struct sadb_msg)
-		+ sizeof(struct sadb_sa)
-		+ sizeof(struct sadb_x_sa2)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(src->sa_len)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(dst->sa_len)
-		+ sizeof(struct sadb_lifetime)
-		+ sizeof(struct sadb_lifetime);
-
-	if (e_type != SADB_EALG_NONE)
-		len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(e_keylen));
-	if (a_type != SADB_AALG_NONE)
-		len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(a_keylen));
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
-	                     satype, seq, getpid());
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbsa(p, ep, spi, wsize, a_type, e_type, flags);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbxsa2(p, ep, mode, reqid);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-
-	if (e_type != SADB_EALG_NONE) {
-		p = pfkey_setsadbkey(p, ep, SADB_EXT_KEY_ENCRYPT,
-		                   keymat, e_keylen);
-		if (!p) {
-			free(newmsg);
-			return -1;
-		}
-	}
-	if (a_type != SADB_AALG_NONE) {
-		p = pfkey_setsadbkey(p, ep, SADB_EXT_KEY_AUTH,
-		                   keymat + e_keylen, a_keylen);
-		if (!p) {
-			free(newmsg);
-			return -1;
-		}
-	}
-
-	/* set sadb_lifetime for destination */
-	p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD,
-			l_alloc, l_bytes, l_addtime, l_usetime);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_SOFT,
-			l_alloc, l_bytes, l_addtime, l_usetime);
-	if (!p || p != ep) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __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:
+        if (e_type == SADB_EALG_NONE) {
+            __ipsec_errcode = EIPSEC_NO_ALGS;
+            return -1;
+        }
+        break;
+    case SADB_SATYPE_AH:
+        if (e_type != SADB_EALG_NONE) {
+            __ipsec_errcode = EIPSEC_INVAL_ALGS;
+            return -1;
+        }
+        if (a_type == SADB_AALG_NONE) {
+            __ipsec_errcode = EIPSEC_NO_ALGS;
+            return -1;
+        }
+        break;
+    case SADB_X_SATYPE_IPCOMP:
+        if (e_type == SADB_X_CALG_NONE) {
+            __ipsec_errcode = EIPSEC_INVAL_ALGS;
+            return -1;
+        }
+        if (a_type != SADB_AALG_NONE) {
+            __ipsec_errcode = EIPSEC_NO_ALGS;
+            return -1;
+        }
+        break;
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(struct sadb_sa)
+          + sizeof(struct sadb_x_sa2)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len)
+          + sizeof(struct sadb_lifetime)
+          + sizeof(struct sadb_lifetime);
+
+    if (e_type != SADB_EALG_NONE)
+        len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(e_keylen));
+    if (a_type != SADB_AALG_NONE)
+        len += (sizeof(struct sadb_key) + PFKEY_ALIGN8(a_keylen));
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
+                         satype, seq, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbsa(p, ep, spi, wsize, a_type, e_type, flags);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbxsa2(p, ep, mode, reqid);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    if (e_type != SADB_EALG_NONE) {
+        p = pfkey_setsadbkey(p, ep, SADB_EXT_KEY_ENCRYPT,
+                             keymat, e_keylen);
+        if (!p) {
+            free(newmsg);
+            return -1;
+        }
+    }
+    if (a_type != SADB_AALG_NONE) {
+        p = pfkey_setsadbkey(p, ep, SADB_EXT_KEY_AUTH,
+                             keymat + e_keylen, a_keylen);
+        if (!p) {
+            free(newmsg);
+            return -1;
+        }
+    }
+
+    /* set sadb_lifetime for destination */
+    p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD,
+                              l_alloc, l_bytes, l_addtime, l_usetime);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_SOFT,
+                              l_alloc, l_bytes, l_addtime, l_usetime);
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /* sending SADB_DELETE or SADB_GET message to the kernel */
 static int
 pfkey_send_x2(so, type, satype, mode, src, dst, spi)
-	int so;
-	u_int type, satype, mode;
-	struct sockaddr *src, *dst;
-	u_int32_t spi;
+int so;
+u_int type, satype, mode;
+struct sockaddr *src, *dst;
+u_int32_t spi;
 {
-	struct sadb_msg *newmsg;
-	int len;
-	caddr_t p;
-	int plen;
-	caddr_t ep;
-	
-	(void)mode;
-
-	/* validity check */
-	if (src == NULL || dst == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-	if (src->sa_family != dst->sa_family) {
-		__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)
-		+ sizeof(struct sadb_sa)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(src->sa_len)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(dst->sa_len);
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0,
-	    getpid());
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbsa(p, ep, spi, 0, 0, 0, 0);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
-	    IPSEC_ULPROTO_ANY);
-	if (!p || p != ep) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    (void)mode;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __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)
+          + sizeof(struct sadb_sa)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(dst->sa_len);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0,
+                         getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbsa(p, ep, spi, 0, 0, 0, 0);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen,
+                          IPSEC_ULPROTO_ANY);
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /*
@@ -1381,205 +1381,205 @@ pfkey_send_x2(so, type, satype, mode, src, dst, spi)
  */
 static int
 pfkey_send_x3(so, type, satype)
-	int so;
-	u_int type, satype;
+int so;
+u_int type, satype;
 {
-	struct sadb_msg *newmsg;
-	int len;
-	caddr_t p;
-	caddr_t ep;
-
-	/* validity check */
-	switch (type) {
-	case SADB_X_PROMISC:
-		if (satype != 0 && satype != 1) {
-			__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-			return -1;
-		}
-		break;
-	default:
-		switch (satype) {
-		case SADB_SATYPE_UNSPEC:
-		case SADB_SATYPE_AH:
-		case SADB_SATYPE_ESP:
-		case SADB_X_SATYPE_IPCOMP:
-			break;
-		default:
-			__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-			return -1;
-		}
-	}
-
-	/* create new sadb_msg to send. */
-	len = sizeof(struct sadb_msg);
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0,
-	    getpid());
-	if (!p || p != ep) {
-		free(newmsg);
-		return -1;
-	}
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    caddr_t ep;
+
+    /* validity check */
+    switch (type) {
+    case SADB_X_PROMISC:
+        if (satype != 0 && satype != 1) {
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+        break;
+    default:
+        switch (satype) {
+        case SADB_SATYPE_UNSPEC:
+        case SADB_SATYPE_AH:
+        case SADB_SATYPE_ESP:
+        case SADB_X_SATYPE_IPCOMP:
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+    }
+
+    /* create new sadb_msg to send. */
+    len = sizeof(struct sadb_msg);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0,
+                         getpid());
+    if (!p || p != ep) {
+        free(newmsg);
+        return -1;
+    }
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /* sending SADB_X_SPDADD message to the kernel */
 static int
 pfkey_send_x4(so, type, src, prefs, dst, prefd, proto,
-		ltime, vtime, policy, policylen, seq)
-	int so;
-	struct sockaddr *src, *dst;
-	u_int type, prefs, prefd, proto;
-	u_int64_t ltime, vtime;
-	char *policy;
-	int policylen;
-	u_int32_t seq;
+              ltime, vtime, policy, policylen, seq)
+int so;
+struct sockaddr *src, *dst;
+u_int type, prefs, prefd, proto;
+u_int64_t ltime, vtime;
+char *policy;
+int policylen;
+u_int32_t seq;
 {
-	struct sadb_msg *newmsg;
-	int len;
-	caddr_t p;
-	int plen;
-	caddr_t ep;
-
-	/* validity check */
-	if (src == NULL || dst == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-	if (src->sa_family != dst->sa_family) {
-		__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;
-	}
-	if (prefs > (u_int)plen || prefd > (u_int)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(src->sa_len)
-		+ sizeof(struct sadb_address)
-		+ PFKEY_ALIGN8(src->sa_len)
-		+ sizeof(struct sadb_lifetime)
-		+ policylen;
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
-	    SADB_SATYPE_UNSPEC, seq, getpid());
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, prefs, proto);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, prefd, proto);
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-	p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD,
-			0, 0, ltime, vtime);
-	if (!p || p + policylen != ep) {
-		free(newmsg);
-		return -1;
-	}
-	memcpy(p, policy, policylen);
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    int len;
+    caddr_t p;
+    int plen;
+    caddr_t ep;
+
+    /* validity check */
+    if (src == NULL || dst == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+    if (src->sa_family != dst->sa_family) {
+        __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;
+    }
+    if (prefs > (u_int)plen || prefd > (u_int)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(src->sa_len)
+          + sizeof(struct sadb_address)
+          + PFKEY_ALIGN8(src->sa_len)
+          + sizeof(struct sadb_lifetime)
+          + policylen;
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
+                         SADB_SATYPE_UNSPEC, seq, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, prefs, proto);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, prefd, proto);
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+    p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD,
+                              0, 0, ltime, vtime);
+    if (!p || p + policylen != ep) {
+        free(newmsg);
+        return -1;
+    }
+    memcpy(p, policy, policylen);
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /* sending SADB_X_SPDGET or SADB_X_SPDDELETE message to the kernel */
 static int
 pfkey_send_x5(so, type, spid)
-	int so;
-	u_int type;
-	u_int32_t spid;
+int so;
+u_int type;
+u_int32_t spid;
 {
-	struct sadb_msg *newmsg;
-	struct sadb_x_policy xpl;
-	int len;
-	caddr_t p;
-	caddr_t ep;
-
-	/* create new sadb_msg to reply. */
-	len = sizeof(struct sadb_msg)
-		+ sizeof(xpl);
-
-	if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-	ep = ((caddr_t)newmsg) + len;
-
-	p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
-	    SADB_SATYPE_UNSPEC, 0, getpid());
-	if (!p) {
-		free(newmsg);
-		return -1;
-	}
-
-	if (p + sizeof(xpl) != ep) {
-		free(newmsg);
-		return -1;
-	}
-	memset(&xpl, 0, sizeof(xpl));
-	xpl.sadb_x_policy_len = PFKEY_UNUNIT64(sizeof(xpl));
-	xpl.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
-	xpl.sadb_x_policy_id = spid;
-	memcpy(p, &xpl, sizeof(xpl));
-
-	/* send message */
-	len = pfkey_send(so, newmsg, len);
-	free(newmsg);
-
-	if (len < 0)
-		return -1;
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    struct sadb_msg *newmsg;
+    struct sadb_x_policy xpl;
+    int len;
+    caddr_t p;
+    caddr_t ep;
+
+    /* create new sadb_msg to reply. */
+    len = sizeof(struct sadb_msg)
+          + sizeof(xpl);
+
+    if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+    ep = ((caddr_t)newmsg) + len;
+
+    p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len,
+                         SADB_SATYPE_UNSPEC, 0, getpid());
+    if (!p) {
+        free(newmsg);
+        return -1;
+    }
+
+    if (p + sizeof(xpl) != ep) {
+        free(newmsg);
+        return -1;
+    }
+    memset(&xpl, 0, sizeof(xpl));
+    xpl.sadb_x_policy_len = PFKEY_UNUNIT64(sizeof(xpl));
+    xpl.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
+    xpl.sadb_x_policy_id = spid;
+    memcpy(p, &xpl, sizeof(xpl));
+
+    /* send message */
+    len = pfkey_send(so, newmsg, len);
+    free(newmsg);
+
+    if (len < 0)
+        return -1;
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /*
@@ -1591,23 +1591,23 @@ pfkey_send_x5(so, type, spid)
 int
 pfkey_open()
 {
-	int so;
-	const int bufsiz = 128 * 1024;	/*is 128K enough?*/
-
-	if ((so = socket(PF_KEY, SOCK_RAW, PF_KEY_V2)) < 0) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
-
-	/*
-	 * This is a temporary workaround for KAME PR 154.
-	 * Don't really care even if it fails.
-	 */
-	(void)setsockopt(so, SOL_SOCKET, SO_SNDBUF, &bufsiz, sizeof(bufsiz));
-	(void)setsockopt(so, SOL_SOCKET, SO_RCVBUF, &bufsiz, sizeof(bufsiz));
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return so;
+    int so;
+    const int bufsiz = 128 * 1024;  /*is 128K enough?*/
+
+    if ((so = socket(PF_KEY, SOCK_RAW, PF_KEY_V2)) < 0) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
+
+    /*
+     * This is a temporary workaround for KAME PR 154.
+     * Don't really care even if it fails.
+     */
+    (void)setsockopt(so, SOL_SOCKET, SO_SNDBUF, &bufsiz, sizeof(bufsiz));
+    (void)setsockopt(so, SOL_SOCKET, SO_RCVBUF, &bufsiz, sizeof(bufsiz));
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return so;
 }
 
 /*
@@ -1618,12 +1618,12 @@ pfkey_open()
  */
 void
 pfkey_close(so)
-	int so;
+int so;
 {
-	(void)close(so);
+    (void)close(so);
 
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return;
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return;
 }
 
 /*
@@ -1637,54 +1637,54 @@ pfkey_close(so)
  */
 struct sadb_msg *
 pfkey_recv(so)
-	int so;
+int so;
 {
-	struct sadb_msg buf, *newmsg;
-	int len, reallen;
-
-	while ((len = recv(so, (caddr_t)&buf, sizeof(buf), MSG_PEEK)) < 0) {
-		if (errno == EINTR)
-			continue;
-		__ipsec_set_strerror(strerror(errno));
-		return NULL;
-	}
-
-	if ((size_t)len < sizeof(buf)) {
-		recv(so, (caddr_t)&buf, sizeof(buf), 0);
-		__ipsec_errcode = EIPSEC_MAX;
-		return NULL;
-	}
-
-	/* read real message */
-	reallen = PFKEY_UNUNIT64(buf.sadb_msg_len);
-	if ((newmsg = CALLOC(reallen, struct sadb_msg *)) == 0) {
-		__ipsec_set_strerror(strerror(errno));
-		return NULL;
-	}
-
-	while ((len = recv(so, (caddr_t)newmsg, reallen, 0)) < 0) {
-		if (errno == EINTR)
-			continue;
-		__ipsec_set_strerror(strerror(errno));
-		free(newmsg);
-		return NULL;
-	}
-
-	if (len != reallen) {
-		__ipsec_errcode = EIPSEC_SYSTEM_ERROR;
-		free(newmsg);
-		return NULL;
-	}
-
-	/* don't trust what the kernel says, validate! */
-	if (PFKEY_UNUNIT64(newmsg->sadb_msg_len) != len) {
-		__ipsec_errcode = EIPSEC_SYSTEM_ERROR;
-		free(newmsg);
-		return NULL;
-	}
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return newmsg;
+    struct sadb_msg buf, *newmsg;
+    int len, reallen;
+
+    while ((len = recv(so, (caddr_t)&buf, sizeof(buf), MSG_PEEK)) < 0) {
+        if (errno == EINTR)
+            continue;
+        __ipsec_set_strerror(strerror(errno));
+        return NULL;
+    }
+
+    if ((size_t)len < sizeof(buf)) {
+        recv(so, (caddr_t)&buf, sizeof(buf), 0);
+        __ipsec_errcode = EIPSEC_MAX;
+        return NULL;
+    }
+
+    /* read real message */
+    reallen = PFKEY_UNUNIT64(buf.sadb_msg_len);
+    if ((newmsg = CALLOC(reallen, struct sadb_msg *)) == 0) {
+        __ipsec_set_strerror(strerror(errno));
+        return NULL;
+    }
+
+    while ((len = recv(so, (caddr_t)newmsg, reallen, 0)) < 0) {
+        if (errno == EINTR)
+            continue;
+        __ipsec_set_strerror(strerror(errno));
+        free(newmsg);
+        return NULL;
+    }
+
+    if (len != reallen) {
+        __ipsec_errcode = EIPSEC_SYSTEM_ERROR;
+        free(newmsg);
+        return NULL;
+    }
+
+    /* don't trust what the kernel says, validate! */
+    if (PFKEY_UNUNIT64(newmsg->sadb_msg_len) != len) {
+        __ipsec_errcode = EIPSEC_SYSTEM_ERROR;
+        free(newmsg);
+        return NULL;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return newmsg;
 }
 
 /*
@@ -1695,17 +1695,17 @@ pfkey_recv(so)
  */
 int
 pfkey_send(so, msg, len)
-	int so;
-	struct sadb_msg *msg;
-	int len;
+int so;
+struct sadb_msg *msg;
+int len;
 {
-	if ((len = send(so, (caddr_t)msg, len, 0)) < 0) {
-		__ipsec_set_strerror(strerror(errno));
-		return -1;
-	}
+    if ((len = send(so, (caddr_t)msg, len, 0)) < 0) {
+        __ipsec_set_strerror(strerror(errno));
+        return -1;
+    }
 
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return len;
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return len;
 }
 
 /*
@@ -1724,87 +1724,87 @@ pfkey_send(so, msg, len)
  */
 int
 pfkey_align(msg, mhp)
-	struct sadb_msg *msg;
-	caddr_t *mhp;
+struct sadb_msg *msg;
+caddr_t *mhp;
 {
-	struct sadb_ext *ext;
-	int i;
-	caddr_t p;
-	caddr_t ep;	/* XXX should be passed from upper layer */
-
-	/* validity check */
-	if (msg == NULL || mhp == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-
-	/* initialize */
-	for (i = 0; i < SADB_EXT_MAX + 1; i++)
-		mhp[i] = NULL;
-
-	mhp[0] = (caddr_t)msg;
-
-	/* initialize */
-	p = (caddr_t) msg;
-	ep = p + PFKEY_UNUNIT64(msg->sadb_msg_len);
-
-	/* skip base header */
-	p += sizeof(struct sadb_msg);
-
-	while (p < ep) {
-		ext = (struct sadb_ext *)p;
-		if (ep < p + sizeof(*ext) || (size_t)PFKEY_EXTLEN(ext) < sizeof(*ext) ||
-		    ep < p + PFKEY_EXTLEN(ext)) {
-			/* invalid format */
-			break;
-		}
-
-		/* duplicate check */
-		/* XXX Are there duplication either KEY_AUTH or KEY_ENCRYPT ?*/
-		if (mhp[ext->sadb_ext_type] != NULL) {
-			__ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
-			return -1;
-		}
-
-		/* set pointer */
-		switch (ext->sadb_ext_type) {
-		case SADB_EXT_SA:
-		case SADB_EXT_LIFETIME_CURRENT:
-		case SADB_EXT_LIFETIME_HARD:
-		case SADB_EXT_LIFETIME_SOFT:
-		case SADB_EXT_ADDRESS_SRC:
-		case SADB_EXT_ADDRESS_DST:
-		case SADB_EXT_ADDRESS_PROXY:
-		case SADB_EXT_KEY_AUTH:
-			/* XXX should to be check weak keys. */
-		case SADB_EXT_KEY_ENCRYPT:
-			/* XXX should to be check weak keys. */
-		case SADB_EXT_IDENTITY_SRC:
-		case SADB_EXT_IDENTITY_DST:
-		case SADB_EXT_SENSITIVITY:
-		case SADB_EXT_PROPOSAL:
-		case SADB_EXT_SUPPORTED_AUTH:
-		case SADB_EXT_SUPPORTED_ENCRYPT:
-		case SADB_EXT_SPIRANGE:
-		case SADB_X_EXT_POLICY:
-		case SADB_X_EXT_SA2:
-			mhp[ext->sadb_ext_type] = (caddr_t)ext;
-			break;
-		default:
-			__ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
-			return -1;
-		}
-
-		p += PFKEY_EXTLEN(ext);
-	}
-
-	if (p != ep) {
-		__ipsec_errcode = EIPSEC_INVAL_SADBMSG;
-		return -1;
-	}
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return 0;
+    struct sadb_ext *ext;
+    int i;
+    caddr_t p;
+    caddr_t ep; /* XXX should be passed from upper layer */
+
+    /* validity check */
+    if (msg == NULL || mhp == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    /* initialize */
+    for (i = 0; i < SADB_EXT_MAX + 1; i++)
+        mhp[i] = NULL;
+
+    mhp[0] = (caddr_t)msg;
+
+    /* initialize */
+    p = (caddr_t) msg;
+    ep = p + PFKEY_UNUNIT64(msg->sadb_msg_len);
+
+    /* skip base header */
+    p += sizeof(struct sadb_msg);
+
+    while (p < ep) {
+        ext = (struct sadb_ext *)p;
+        if (ep < p + sizeof(*ext) || (size_t)PFKEY_EXTLEN(ext) < sizeof(*ext) ||
+            ep < p + PFKEY_EXTLEN(ext)) {
+            /* invalid format */
+            break;
+        }
+
+        /* duplicate check */
+        /* XXX Are there duplication either KEY_AUTH or KEY_ENCRYPT ?*/
+        if (mhp[ext->sadb_ext_type] != NULL) {
+            __ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
+            return -1;
+        }
+
+        /* set pointer */
+        switch (ext->sadb_ext_type) {
+        case SADB_EXT_SA:
+        case SADB_EXT_LIFETIME_CURRENT:
+        case SADB_EXT_LIFETIME_HARD:
+        case SADB_EXT_LIFETIME_SOFT:
+        case SADB_EXT_ADDRESS_SRC:
+        case SADB_EXT_ADDRESS_DST:
+        case SADB_EXT_ADDRESS_PROXY:
+        case SADB_EXT_KEY_AUTH:
+        /* XXX should to be check weak keys. */
+        case SADB_EXT_KEY_ENCRYPT:
+        /* XXX should to be check weak keys. */
+        case SADB_EXT_IDENTITY_SRC:
+        case SADB_EXT_IDENTITY_DST:
+        case SADB_EXT_SENSITIVITY:
+        case SADB_EXT_PROPOSAL:
+        case SADB_EXT_SUPPORTED_AUTH:
+        case SADB_EXT_SUPPORTED_ENCRYPT:
+        case SADB_EXT_SPIRANGE:
+        case SADB_X_EXT_POLICY:
+        case SADB_X_EXT_SA2:
+            mhp[ext->sadb_ext_type] = (caddr_t)ext;
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_EXTTYPE;
+            return -1;
+        }
+
+        p += PFKEY_EXTLEN(ext);
+    }
+
+    if (p != ep) {
+        __ipsec_errcode = EIPSEC_INVAL_SADBMSG;
+        return -1;
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
 }
 
 /*
@@ -1820,109 +1820,109 @@ pfkey_align(msg, mhp)
  */
 int
 pfkey_check(mhp)
-	caddr_t *mhp;
+caddr_t *mhp;
 {
-	struct sadb_msg *msg;
-
-	/* validity check */
-	if (mhp == NULL || mhp[0] == NULL) {
-		__ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
-		return -1;
-	}
-
-	msg = (struct sadb_msg *)mhp[0];
-
-	/* check version */
-	if (msg->sadb_msg_version != PF_KEY_V2) {
-		__ipsec_errcode = EIPSEC_INVAL_VERSION;
-		return -1;
-	}
-
-	/* check type */
-	if (msg->sadb_msg_type > SADB_MAX) {
-		__ipsec_errcode = EIPSEC_INVAL_MSGTYPE;
-		return -1;
-	}
-
-	/* check SA type */
-	switch (msg->sadb_msg_satype) {
-	case SADB_SATYPE_UNSPEC:
-		switch (msg->sadb_msg_type) {
-		case SADB_GETSPI:
-		case SADB_UPDATE:
-		case SADB_ADD:
-		case SADB_DELETE:
-		case SADB_GET:
-		case SADB_ACQUIRE:
-		case SADB_EXPIRE:
-			__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-			return -1;
-		}
-		break;
-	case SADB_SATYPE_ESP:
-	case SADB_SATYPE_AH:
-	case SADB_X_SATYPE_IPCOMP:
-		switch (msg->sadb_msg_type) {
-		case SADB_X_SPDADD:
-		case SADB_X_SPDDELETE:
-		case SADB_X_SPDGET:
-		case SADB_X_SPDDUMP:
-		case SADB_X_SPDFLUSH:
-			__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-			return -1;
-		}
-		break;
-	case SADB_SATYPE_RSVP:
-	case SADB_SATYPE_OSPFV2:
-	case SADB_SATYPE_RIPV2:
-	case SADB_SATYPE_MIP:
-		__ipsec_errcode = EIPSEC_NOT_SUPPORTED;
-		return -1;
-	case 1:	/* XXX: What does it do ? */
-		if (msg->sadb_msg_type == SADB_X_PROMISC)
-			break;
-		/*FALLTHROUGH*/
-	default:
-		__ipsec_errcode = EIPSEC_INVAL_SATYPE;
-		return -1;
-	}
-
-	/* check field of upper layer protocol and address family */
-	if (mhp[SADB_EXT_ADDRESS_SRC] != NULL
-	 && mhp[SADB_EXT_ADDRESS_DST] != NULL) {
-		struct sadb_address *src0, *dst0;
-
-		src0 = (struct sadb_address *)(mhp[SADB_EXT_ADDRESS_SRC]);
-		dst0 = (struct sadb_address *)(mhp[SADB_EXT_ADDRESS_DST]);
-
-		if (src0->sadb_address_proto != dst0->sadb_address_proto) {
-			__ipsec_errcode = EIPSEC_PROTO_MISMATCH;
-			return -1;
-		}
-
-		if (PFKEY_ADDR_SADDR(src0)->sa_family
-		 != PFKEY_ADDR_SADDR(dst0)->sa_family) {
-			__ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
-			return -1;
-		}
-
-		switch (PFKEY_ADDR_SADDR(src0)->sa_family) {
-		case AF_INET:
-		case AF_INET6:
-			break;
-		default:
-			__ipsec_errcode = EIPSEC_INVAL_FAMILY;
-			return -1;
-		}
-
-		/*
-		 * prefixlen == 0 is valid because there must be the case
-		 * all addresses are matched.
-		 */
-	}
-
-	__ipsec_errcode = EIPSEC_NO_ERROR;
-	return 0;
+    struct sadb_msg *msg;
+
+    /* validity check */
+    if (mhp == NULL || mhp[0] == NULL) {
+        __ipsec_errcode = EIPSEC_INVAL_ARGUMENT;
+        return -1;
+    }
+
+    msg = (struct sadb_msg *)mhp[0];
+
+    /* check version */
+    if (msg->sadb_msg_version != PF_KEY_V2) {
+        __ipsec_errcode = EIPSEC_INVAL_VERSION;
+        return -1;
+    }
+
+    /* check type */
+    if (msg->sadb_msg_type > SADB_MAX) {
+        __ipsec_errcode = EIPSEC_INVAL_MSGTYPE;
+        return -1;
+    }
+
+    /* check SA type */
+    switch (msg->sadb_msg_satype) {
+    case SADB_SATYPE_UNSPEC:
+        switch (msg->sadb_msg_type) {
+        case SADB_GETSPI:
+        case SADB_UPDATE:
+        case SADB_ADD:
+        case SADB_DELETE:
+        case SADB_GET:
+        case SADB_ACQUIRE:
+        case SADB_EXPIRE:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+        break;
+    case SADB_SATYPE_ESP:
+    case SADB_SATYPE_AH:
+    case SADB_X_SATYPE_IPCOMP:
+        switch (msg->sadb_msg_type) {
+        case SADB_X_SPDADD:
+        case SADB_X_SPDDELETE:
+        case SADB_X_SPDGET:
+        case SADB_X_SPDDUMP:
+        case SADB_X_SPDFLUSH:
+            __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+            return -1;
+        }
+        break;
+    case SADB_SATYPE_RSVP:
+    case SADB_SATYPE_OSPFV2:
+    case SADB_SATYPE_RIPV2:
+    case SADB_SATYPE_MIP:
+        __ipsec_errcode = EIPSEC_NOT_SUPPORTED;
+        return -1;
+    case 1: /* XXX: What does it do ? */
+        if (msg->sadb_msg_type == SADB_X_PROMISC)
+            break;
+    /*FALLTHROUGH*/
+    default:
+        __ipsec_errcode = EIPSEC_INVAL_SATYPE;
+        return -1;
+    }
+
+    /* check field of upper layer protocol and address family */
+    if (mhp[SADB_EXT_ADDRESS_SRC] != NULL
+        && mhp[SADB_EXT_ADDRESS_DST] != NULL) {
+        struct sadb_address *src0, *dst0;
+
+        src0 = (struct sadb_address *)(mhp[SADB_EXT_ADDRESS_SRC]);
+        dst0 = (struct sadb_address *)(mhp[SADB_EXT_ADDRESS_DST]);
+
+        if (src0->sadb_address_proto != dst0->sadb_address_proto) {
+            __ipsec_errcode = EIPSEC_PROTO_MISMATCH;
+            return -1;
+        }
+
+        if (PFKEY_ADDR_SADDR(src0)->sa_family
+            != PFKEY_ADDR_SADDR(dst0)->sa_family) {
+            __ipsec_errcode = EIPSEC_FAMILY_MISMATCH;
+            return -1;
+        }
+
+        switch (PFKEY_ADDR_SADDR(src0)->sa_family) {
+        case AF_INET:
+        case AF_INET6:
+            break;
+        default:
+            __ipsec_errcode = EIPSEC_INVAL_FAMILY;
+            return -1;
+        }
+
+        /*
+         * prefixlen == 0 is valid because there must be the case
+         * all addresses are matched.
+         */
+    }
+
+    __ipsec_errcode = EIPSEC_NO_ERROR;
+    return 0;
 }
 
 /*
@@ -1931,33 +1931,33 @@ pfkey_check(mhp)
  */
 static caddr_t
 pfkey_setsadbmsg(buf, lim, type, tlen, satype, seq, pid)
-	caddr_t buf;
-	caddr_t lim;
-	u_int type, satype;
-	u_int tlen;
-	u_int32_t seq;
-	pid_t pid;
+caddr_t buf;
+caddr_t lim;
+u_int type, satype;
+u_int tlen;
+u_int32_t seq;
+pid_t pid;
 {
-	struct sadb_msg *p;
-	u_int len;
-
-	p = (struct sadb_msg *)buf;
-	len = sizeof(struct sadb_msg);
-
-	if (buf + len > lim)
-		return NULL;
-
-	memset(p, 0, len);
-	p->sadb_msg_version = PF_KEY_V2;
-	p->sadb_msg_type = type;
-	p->sadb_msg_errno = 0;
-	p->sadb_msg_satype = satype;
-	p->sadb_msg_len = PFKEY_UNIT64(tlen);
-	p->sadb_msg_reserved = 0;
-	p->sadb_msg_seq = seq;
-	p->sadb_msg_pid = (u_int32_t)pid;
-
-	return(buf + len);
+    struct sadb_msg *p;
+    u_int len;
+
+    p = (struct sadb_msg *)buf;
+    len = sizeof(struct sadb_msg);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_msg_version = PF_KEY_V2;
+    p->sadb_msg_type = type;
+    p->sadb_msg_errno = 0;
+    p->sadb_msg_satype = satype;
+    p->sadb_msg_len = PFKEY_UNIT64(tlen);
+    p->sadb_msg_reserved = 0;
+    p->sadb_msg_seq = seq;
+    p->sadb_msg_pid = (u_int32_t)pid;
+
+    return(buf + len);
 }
 
 /*
@@ -1966,31 +1966,31 @@ pfkey_setsadbmsg(buf, lim, type, tlen, satype, seq, pid)
  */
 static caddr_t
 pfkey_setsadbsa(buf, lim, spi, wsize, auth, enc, flags)
-	caddr_t buf;
-	caddr_t lim;
-	u_int32_t spi, flags;
-	u_int wsize, auth, enc;
+caddr_t buf;
+caddr_t lim;
+u_int32_t spi, flags;
+u_int wsize, auth, enc;
 {
-	struct sadb_sa *p;
-	u_int len;
-
-	p = (struct sadb_sa *)buf;
-	len = sizeof(struct sadb_sa);
-
-	if (buf + len > lim)
-		return NULL;
-
-	memset(p, 0, len);
-	p->sadb_sa_len = PFKEY_UNIT64(len);
-	p->sadb_sa_exttype = SADB_EXT_SA;
-	p->sadb_sa_spi = spi;
-	p->sadb_sa_replay = wsize;
-	p->sadb_sa_state = SADB_SASTATE_LARVAL;
-	p->sadb_sa_auth = auth;
-	p->sadb_sa_encrypt = enc;
-	p->sadb_sa_flags = flags;
-
-	return(buf + len);
+    struct sadb_sa *p;
+    u_int len;
+
+    p = (struct sadb_sa *)buf;
+    len = sizeof(struct sadb_sa);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_sa_len = PFKEY_UNIT64(len);
+    p->sadb_sa_exttype = SADB_EXT_SA;
+    p->sadb_sa_spi = spi;
+    p->sadb_sa_replay = wsize;
+    p->sadb_sa_state = SADB_SASTATE_LARVAL;
+    p->sadb_sa_auth = auth;
+    p->sadb_sa_encrypt = enc;
+    p->sadb_sa_flags = flags;
+
+    return(buf + len);
 }
 
 /*
@@ -2000,32 +2000,32 @@ pfkey_setsadbsa(buf, lim, spi, wsize, auth, enc, flags)
  */
 static caddr_t
 pfkey_setsadbaddr(buf, lim, exttype, saddr, prefixlen, ul_proto)
-	caddr_t buf;
-	caddr_t lim;
-	u_int exttype;
-	struct sockaddr *saddr;
-	u_int prefixlen;
-	u_int ul_proto;
+caddr_t buf;
+caddr_t lim;
+u_int exttype;
+struct sockaddr *saddr;
+u_int prefixlen;
+u_int ul_proto;
 {
-	struct sadb_address *p;
-	u_int len;
+    struct sadb_address *p;
+    u_int len;
 
-	p = (struct sadb_address *)buf;
-	len = sizeof(struct sadb_address) + PFKEY_ALIGN8(saddr->sa_len);
+    p = (struct sadb_address *)buf;
+    len = sizeof(struct sadb_address) + PFKEY_ALIGN8(saddr->sa_len);
 
-	if (buf + len > lim)
-		return NULL;
+    if (buf + len > lim)
+        return NULL;
 
-	memset(p, 0, len);
-	p->sadb_address_len = PFKEY_UNIT64(len);
-	p->sadb_address_exttype = exttype & 0xffff;
-	p->sadb_address_proto = ul_proto & 0xff;
-	p->sadb_address_prefixlen = prefixlen;
-	p->sadb_address_reserved = 0;
+    memset(p, 0, len);
+    p->sadb_address_len = PFKEY_UNIT64(len);
+    p->sadb_address_exttype = exttype & 0xffff;
+    p->sadb_address_proto = ul_proto & 0xff;
+    p->sadb_address_prefixlen = prefixlen;
+    p->sadb_address_reserved = 0;
 
-	memcpy(p + 1, saddr, saddr->sa_len);
+    memcpy(p + 1, saddr, saddr->sa_len);
 
-	return(buf + len);
+    return(buf + len);
 }
 
 /*
@@ -2034,29 +2034,29 @@ pfkey_setsadbaddr(buf, lim, exttype, saddr, prefixlen, ul_proto)
  */
 static caddr_t
 pfkey_setsadbkey(buf, lim, type, key, keylen)
-	caddr_t buf;
-	caddr_t lim;
-	caddr_t key;
-	u_int type, keylen;
+caddr_t buf;
+caddr_t lim;
+caddr_t key;
+u_int type, keylen;
 {
-	struct sadb_key *p;
-	u_int len;
+    struct sadb_key *p;
+    u_int len;
 
-	p = (struct sadb_key *)buf;
-	len = sizeof(struct sadb_key) + PFKEY_ALIGN8(keylen);
+    p = (struct sadb_key *)buf;
+    len = sizeof(struct sadb_key) + PFKEY_ALIGN8(keylen);
 
-	if (buf + len > lim)
-		return NULL;
+    if (buf + len > lim)
+        return NULL;
 
-	memset(p, 0, len);
-	p->sadb_key_len = PFKEY_UNIT64(len);
-	p->sadb_key_exttype = type;
-	p->sadb_key_bits = keylen << 3;
-	p->sadb_key_reserved = 0;
+    memset(p, 0, len);
+    p->sadb_key_len = PFKEY_UNIT64(len);
+    p->sadb_key_exttype = type;
+    p->sadb_key_bits = keylen << 3;
+    p->sadb_key_reserved = 0;
 
-	memcpy(p + 1, key, keylen);
+    memcpy(p + 1, key, keylen);
 
-	return buf + len;
+    return buf + len;
 }
 
 /*
@@ -2065,44 +2065,44 @@ pfkey_setsadbkey(buf, lim, type, key, keylen)
  */
 static caddr_t
 pfkey_setsadblifetime(buf, lim, type, l_alloc, l_bytes, l_addtime, l_usetime)
-	caddr_t buf;
-	caddr_t lim;
-	u_int type;
-	u_int32_t l_alloc, l_bytes, l_addtime, l_usetime;
+caddr_t buf;
+caddr_t lim;
+u_int type;
+u_int32_t l_alloc, l_bytes, l_addtime, l_usetime;
 {
-	struct sadb_lifetime *p;
-	u_int len;
-
-	p = (struct sadb_lifetime *)buf;
-	len = sizeof(struct sadb_lifetime);
-
-	if (buf + len > lim)
-		return NULL;
-
-	memset(p, 0, len);
-	p->sadb_lifetime_len = PFKEY_UNIT64(len);
-	p->sadb_lifetime_exttype = type;
-
-	switch (type) {
-	case SADB_EXT_LIFETIME_SOFT:
-		p->sadb_lifetime_allocations
-			= (l_alloc * soft_lifetime_allocations_rate) /100;
-		p->sadb_lifetime_bytes
-			= (l_bytes * soft_lifetime_bytes_rate) /100;
-		p->sadb_lifetime_addtime
-			= (l_addtime * soft_lifetime_addtime_rate) /100;
-		p->sadb_lifetime_usetime
-			= (l_usetime * soft_lifetime_usetime_rate) /100;
-		break;
-	case SADB_EXT_LIFETIME_HARD:
-		p->sadb_lifetime_allocations = l_alloc;
-		p->sadb_lifetime_bytes = l_bytes;
-		p->sadb_lifetime_addtime = l_addtime;
-		p->sadb_lifetime_usetime = l_usetime;
-		break;
-	}
-
-	return buf + len;
+    struct sadb_lifetime *p;
+    u_int len;
+
+    p = (struct sadb_lifetime *)buf;
+    len = sizeof(struct sadb_lifetime);
+
+    if (buf + len > lim)
+        return NULL;
+
+    memset(p, 0, len);
+    p->sadb_lifetime_len = PFKEY_UNIT64(len);
+    p->sadb_lifetime_exttype = type;
+
+    switch (type) {
+    case SADB_EXT_LIFETIME_SOFT:
+        p->sadb_lifetime_allocations
+            = (l_alloc * soft_lifetime_allocations_rate) /100;
+        p->sadb_lifetime_bytes
+            = (l_bytes * soft_lifetime_bytes_rate) /100;
+        p->sadb_lifetime_addtime
+            = (l_addtime * soft_lifetime_addtime_rate) /100;
+        p->sadb_lifetime_usetime
+            = (l_usetime * soft_lifetime_usetime_rate) /100;
+        break;
+    case SADB_EXT_LIFETIME_HARD:
+        p->sadb_lifetime_allocations = l_alloc;
+        p->sadb_lifetime_bytes = l_bytes;
+        p->sadb_lifetime_addtime = l_addtime;
+        p->sadb_lifetime_usetime = l_usetime;
+        break;
+    }
+
+    return buf + len;
 }
 
 /*
@@ -2111,28 +2111,28 @@ pfkey_setsadblifetime(buf, lim, type, l_alloc, l_bytes, l_addtime, l_usetime)
  */
 static caddr_t
 pfkey_setsadbxsa2(buf, lim, mode0, reqid)
-	caddr_t buf;
-	caddr_t lim;
-	u_int32_t mode0;
-	u_int32_t reqid;
+caddr_t buf;
+caddr_t lim;
+u_int32_t mode0;
+u_int32_t reqid;
 {
-	struct sadb_x_sa2 *p;
-	u_int8_t mode = mode0 & 0xff;
-	u_int len;
+    struct sadb_x_sa2 *p;
+    u_int8_t mode = mode0 & 0xff;
+    u_int len;
 
-	p = (struct sadb_x_sa2 *)buf;
-	len = sizeof(struct sadb_x_sa2);
+    p = (struct sadb_x_sa2 *)buf;
+    len = sizeof(struct sadb_x_sa2);
 
-	if (buf + len > lim)
-		return NULL;
+    if (buf + len > lim)
+        return NULL;
 
-	memset(p, 0, len);
-	p->sadb_x_sa2_len = PFKEY_UNIT64(len);
-	p->sadb_x_sa2_exttype = SADB_X_EXT_SA2;
-	p->sadb_x_sa2_mode = mode;
-	p->sadb_x_sa2_reqid = reqid;
+    memset(p, 0, len);
+    p->sadb_x_sa2_len = PFKEY_UNIT64(len);
+    p->sadb_x_sa2_exttype = SADB_X_EXT_SA2;
+    p->sadb_x_sa2_mode = mode;
+    p->sadb_x_sa2_reqid = reqid;
 
-	return(buf + len);
+    return(buf + len);
 }
 
 #endif /* ndef MDNS_NO_IPSEC */