From: Emmanuel D. <ma...@us...> - 2005-06-29 11:21:42
|
Update of /cvsroot/ipsec-tools/ipsec-tools/src/libipsec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6826/src/libipsec Modified Files: pfkey.c pfkey_dump.c policy_parse.y Log Message: More de-lint from Christos Zoulas: signed/unsigned types, lint constants Index: pfkey.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/libipsec/pfkey.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- pfkey.c 20 May 2005 01:14:28 -0000 1.13 +++ pfkey.c 29 Jun 2005 11:21:14 -0000 1.14 @@ -129,7 +129,7 @@ caddr_t p; /* validity check */ - algno = findsupportedmap(satype); + algno = findsupportedmap((int)satype); if (algno == -1) { __ipsec_errcode = EIPSEC_INVAL_ARGUMENT; return NULL; @@ -141,14 +141,14 @@ tlen = ipsec_supported[algno]->sadb_supported_len - sizeof(struct sadb_supported); - p = (caddr_t)(ipsec_supported[algno] + 1); + p = (void *)(ipsec_supported[algno] + 1); while (tlen > 0) { if (tlen < sizeof(struct sadb_alg)) { /* invalid format */ break; } - if (((struct sadb_alg *)p)->sadb_alg_id == alg_id) - return (struct sadb_alg *)p; + if (((struct sadb_alg *)(void *)p)->sadb_alg_id == alg_id) + return (void *)p; tlen -= sizeof(struct sadb_alg); p += sizeof(struct sadb_alg); @@ -179,12 +179,12 @@ if (*ipsup) free(*ipsup); - *ipsup = malloc(sup->sadb_supported_len); + *ipsup = malloc((size_t)sup->sadb_supported_len); if (!*ipsup) { __ipsec_set_strerror(strerror(errno)); return -1; } - memcpy(*ipsup, sup, sup->sadb_supported_len); + memcpy(*ipsup, sup, (size_t)sup->sadb_supported_len); return 0; } @@ -204,7 +204,7 @@ u_int alg_id; u_int keylen; { - int satype; + u_int satype; /* validity check */ switch (supported) { @@ -353,7 +353,7 @@ return soft_lifetime_usetime_rate; } - return ~0; + return (u_int)~0; } /* @@ -409,19 +409,19 @@ + sizeof(struct sadb_address) + PFKEY_ALIGN8(sysdep_sa_len(dst)); - if (min > 255 && max < ~0) { + if (min > 255 && max < (u_int)~0) { need_spirange++; len += sizeof(struct sadb_spirange); } - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((caddr_t)(void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_GETSPI, - len, satype, seq, getpid()); + p = pfkey_setsadbmsg((void *)newmsg, ep, SADB_GETSPI, + (u_int)len, satype, seq, getpid()); if (!p) { free(newmsg); return -1; @@ -434,7 +434,7 @@ } /* set sadb_address for source */ - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); @@ -442,7 +442,7 @@ } /* set sadb_address for destination */ - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); @@ -509,8 +509,8 @@ 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, 0, 0, NULL, 0)) < 0) + l_alloc, (u_int)l_bytes, (u_int)l_addtime, + (u_int)l_usetime, seq, 0, 0, 0, NULL, 0)) < 0) return -1; return len; @@ -541,9 +541,9 @@ 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, - l_natt_type, l_natt_sport, l_natt_dport, l_natt_oa, - l_natt_frag)) < 0) + l_alloc, (u_int)l_bytes, (u_int)l_addtime, + (u_int)l_usetime, seq, l_natt_type, l_natt_sport, + l_natt_dport, l_natt_oa, l_natt_frag)) < 0) return -1; return len; @@ -575,8 +575,8 @@ 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, 0, 0, NULL, 0)) < 0) + l_alloc, (u_int)l_bytes, (u_int)l_addtime, + (u_int)l_usetime, seq, 0, 0, 0, NULL, 0)) < 0) return -1; return len; @@ -607,9 +607,9 @@ 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, - l_natt_type, l_natt_sport, l_natt_dport, l_natt_oa, - l_natt_frag)) < 0) + l_alloc, (u_int)l_bytes, (u_int)l_addtime, + (u_int)l_usetime, seq, l_natt_type, l_natt_sport, + l_natt_dport, l_natt_oa, l_natt_frag)) < 0) return -1; return len; @@ -645,6 +645,7 @@ * positive: success and return length sent * -1 : error occured, and set errno */ +/*ARGSUSED*/ int pfkey_send_delete_all(so, satype, mode, src, dst) int so; @@ -685,25 +686,25 @@ + sizeof(struct sadb_address) + PFKEY_ALIGN8(sysdep_sa_len(dst)); - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, SADB_DELETE, len, satype, 0, - getpid()); + p = pfkey_setsadbmsg((void *)newmsg, ep, SADB_DELETE, (u_int)len, + satype, 0, getpid()); if (!p) { free(newmsg); return -1; } - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); return -1; } - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p || p != ep) { free(newmsg); @@ -764,7 +765,7 @@ } } } else { - algno = findsupportedmap(satype); + algno = findsupportedmap((int)satype); if (algno == -1) { __ipsec_errcode = EIPSEC_INVAL_ARGUMENT; return -1; @@ -844,13 +845,13 @@ return -1; } - p = (caddr_t)msg; + p = (void *)msg; ep = p + tlen; p += sizeof(struct sadb_msg); while (p < ep) { - sup = (struct sadb_supported *)p; + sup = (void *)p; if (ep < p + sizeof(*sup) || PFKEY_EXTLEN(sup) < sizeof(*sup) || ep < p + sup->sadb_supported_len) { @@ -944,7 +945,8 @@ { int len; - if ((len = pfkey_send_x3(so, SADB_X_PROMISC, (flag ? 1 : 0))) < 0) + if ((len = pfkey_send_x3(so, SADB_X_PROMISC, + (u_int)(flag ? 1 : 0))) < 0) return -1; return len; @@ -969,7 +971,7 @@ if ((len = pfkey_send_x4(so, SADB_X_SPDADD, src, prefs, dst, prefd, proto, - 0, 0, + (u_int64_t)0, (u_int64_t)0, policy, policylen, seq)) < 0) return -1; @@ -1023,7 +1025,7 @@ if ((len = pfkey_send_x4(so, SADB_X_SPDUPDATE, src, prefs, dst, prefd, proto, - 0, 0, + (u_int64_t)0, (u_int64_t)0, policy, policylen, seq)) < 0) return -1; @@ -1082,7 +1084,7 @@ if ((len = pfkey_send_x4(so, SADB_X_SPDDELETE, src, prefs, dst, prefd, proto, - 0, 0, + (u_int64_t)0, (u_int64_t)0, policy, policylen, seq)) < 0) return -1; @@ -1151,7 +1153,7 @@ if ((len = pfkey_send_x4(so, SADB_X_SPDSETIDX, src, prefs, dst, prefd, proto, - 0, 0, + (u_int64_t)0, (u_int64_t)0, policy, policylen, seq)) < 0) return -1; @@ -1310,7 +1312,6 @@ default: __ipsec_errcode = EIPSEC_NO_ALGS; return -1; - break; } len += sizeof(struct sadb_x_nat_t_type); @@ -1326,13 +1327,13 @@ } #endif - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((caddr_t)(void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, + p = pfkey_setsadbmsg((void *)newmsg, ep, type, len, satype, seq, getpid()); if (!p) { free(newmsg); @@ -1348,13 +1349,13 @@ free(newmsg); return -1; } - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); return -1; } - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); @@ -1418,7 +1419,7 @@ if (l_natt_oa) { p = pfkey_setsadbaddr(p, ep, SADB_X_EXT_NAT_T_OA, l_natt_oa, - PFKEY_ALIGN8(sysdep_sa_len(l_natt_oa)), + (u_int)PFKEY_ALIGN8(sysdep_sa_len(l_natt_oa)), IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); @@ -1456,6 +1457,7 @@ } /* sending SADB_DELETE or SADB_GET message to the kernel */ +/*ARGSUSED*/ static int pfkey_send_x2(so, type, satype, mode, src, dst, spi) int so; @@ -1498,13 +1500,13 @@ + sizeof(struct sadb_address) + PFKEY_ALIGN8(sysdep_sa_len(dst)); - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((caddr_t)(void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0, + p = pfkey_setsadbmsg((void *)newmsg, ep, type, len, satype, 0, getpid()); if (!p) { free(newmsg); @@ -1515,13 +1517,13 @@ free(newmsg); return -1; } - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_SRC, src, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p) { free(newmsg); return -1; } - p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, plen, + p = pfkey_setsadbaddr(p, ep, SADB_EXT_ADDRESS_DST, dst, (u_int)plen, IPSEC_ULPROTO_ANY); if (!p || p != ep) { free(newmsg); @@ -1580,13 +1582,13 @@ /* create new sadb_msg to send. */ len = sizeof(struct sadb_msg); - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((caddr_t)(void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, satype, 0, + p = pfkey_setsadbmsg((void *)newmsg, ep, type, len, satype, 0, getpid()); if (!p || p != ep) { free(newmsg); @@ -1657,13 +1659,13 @@ + sizeof(struct sadb_lifetime) + policylen; - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((caddr_t)(void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, + p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, (u_int)len, SADB_SATYPE_UNSPEC, seq, getpid()); if (!p) { free(newmsg); @@ -1680,12 +1682,12 @@ return -1; } p = pfkey_setsadblifetime(p, ep, SADB_EXT_LIFETIME_HARD, - 0, 0, ltime, vtime); + 0, 0, (u_int)ltime, (u_int)vtime); if (!p || p + policylen != ep) { free(newmsg); return -1; } - memcpy(p, policy, policylen); + memcpy(p, policy, (size_t)policylen); /* send message */ len = pfkey_send(so, newmsg, len); @@ -1715,13 +1717,13 @@ len = sizeof(struct sadb_msg) + sizeof(xpl); - if ((newmsg = CALLOC(len, struct sadb_msg *)) == NULL) { + if ((newmsg = CALLOC((size_t)len, struct sadb_msg *)) == NULL) { __ipsec_set_strerror(strerror(errno)); return -1; } - ep = ((caddr_t)newmsg) + len; + ep = ((caddr_t)(void *)newmsg) + len; - p = pfkey_setsadbmsg((caddr_t)newmsg, ep, type, len, + p = pfkey_setsadbmsg((void *)newmsg, ep, type, (u_int)len, SADB_SATYPE_UNSPEC, 0, getpid()); if (!p) { free(newmsg); @@ -1809,7 +1811,7 @@ struct sadb_msg buf, *newmsg; int len, reallen; - while ((len = recv(so, (caddr_t)&buf, sizeof(buf), MSG_PEEK)) < 0) { + while ((len = recv(so, (void *)&buf, sizeof(buf), MSG_PEEK)) < 0) { if (errno == EINTR) continue; __ipsec_set_strerror(strerror(errno)); @@ -1817,19 +1819,19 @@ } if (len < sizeof(buf)) { - recv(so, (caddr_t)&buf, sizeof(buf), 0); + recv(so, (void *)&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) { + if ((newmsg = CALLOC((size_t)reallen, struct sadb_msg *)) == 0) { __ipsec_set_strerror(strerror(errno)); return NULL; } - while ((len = recv(so, (caddr_t)newmsg, reallen, 0)) < 0) { + while ((len = recv(so, (void *)newmsg, (socklen_t)reallen, 0)) < 0) { if (errno == EINTR) continue; __ipsec_set_strerror(strerror(errno)); @@ -1866,7 +1868,7 @@ struct sadb_msg *msg; int len; { - if ((len = send(so, (caddr_t)msg, len, 0)) < 0) { + if ((len = send(so, (void *)msg, (socklen_t)len, 0)) < 0) { __ipsec_set_strerror(strerror(errno)); return -1; } @@ -1909,17 +1911,17 @@ for (i = 0; i < SADB_EXT_MAX + 1; i++) mhp[i] = NULL; - mhp[0] = (caddr_t)msg; + mhp[0] = (void *)msg; /* initialize */ - p = (caddr_t) msg; + p = (void *) 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; + ext = (void *)p; if (ep < p + sizeof(*ext) || PFKEY_EXTLEN(ext) < sizeof(*ext) || ep < p + PFKEY_EXTLEN(ext)) { /* invalid format */ @@ -1964,7 +1966,7 @@ #ifdef SADB_X_EXT_TAG case SADB_X_EXT_TAG: #endif - mhp[ext->sadb_ext_type] = (caddr_t)ext; + mhp[ext->sadb_ext_type] = (void *)ext; break; default: __ipsec_errcode = EIPSEC_INVAL_EXTTYPE; @@ -2006,7 +2008,7 @@ return -1; } - msg = (struct sadb_msg *)mhp[0]; + msg = (void *)mhp[0]; /* check version */ if (msg->sadb_msg_version != PF_KEY_V2) { @@ -2081,8 +2083,8 @@ && 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]); + src0 = (void *)(mhp[SADB_EXT_ADDRESS_SRC]); + dst0 = (void *)(mhp[SADB_EXT_ADDRESS_DST]); if (src0->sadb_address_proto != dst0->sadb_address_proto) { __ipsec_errcode = EIPSEC_PROTO_MISMATCH; @@ -2130,7 +2132,7 @@ struct sadb_msg *p; u_int len; - p = (struct sadb_msg *)buf; + p = (void *)buf; len = sizeof(struct sadb_msg); if (buf + len > lim) @@ -2163,7 +2165,7 @@ struct sadb_sa *p; u_int len; - p = (struct sadb_sa *)buf; + p = (void *)buf; len = sizeof(struct sadb_sa); if (buf + len > lim) @@ -2199,7 +2201,7 @@ struct sadb_address *p; u_int len; - p = (struct sadb_address *)buf; + p = (void *)buf; len = sizeof(struct sadb_address) + PFKEY_ALIGN8(sysdep_sa_len(saddr)); if (buf + len > lim) @@ -2212,7 +2214,7 @@ p->sadb_address_prefixlen = prefixlen; p->sadb_address_reserved = 0; - memcpy(p + 1, saddr, sysdep_sa_len(saddr)); + memcpy(p + 1, saddr, (size_t)sysdep_sa_len(saddr)); return(buf + len); } @@ -2231,7 +2233,7 @@ struct sadb_key *p; u_int len; - p = (struct sadb_key *)buf; + p = (void *)buf; len = sizeof(struct sadb_key) + PFKEY_ALIGN8(keylen); if (buf + len > lim) @@ -2262,7 +2264,7 @@ struct sadb_lifetime *p; u_int len; - p = (struct sadb_lifetime *)buf; + p = (void *)buf; len = sizeof(struct sadb_lifetime); if (buf + len > lim) @@ -2309,7 +2311,7 @@ u_int8_t mode = mode0 & 0xff; u_int len; - p = (struct sadb_x_sa2 *)buf; + p = (void *)buf; len = sizeof(struct sadb_x_sa2); if (buf + len > lim) @@ -2335,7 +2337,7 @@ struct sadb_x_nat_t_type *p; u_int len; - p = (struct sadb_x_nat_t_type *)buf; + p = (void *)buf; len = sizeof(struct sadb_x_nat_t_type); if (buf + len > lim) @@ -2359,7 +2361,7 @@ struct sadb_x_nat_t_port *p; u_int len; - p = (struct sadb_x_nat_t_port *)buf; + p = (void *)buf; len = sizeof(struct sadb_x_nat_t_port); if (buf + len > lim) @@ -2385,7 +2387,7 @@ struct sadb_x_nat_t_frag *p; u_int len; - p = (struct sadb_x_nat_t_frag *)buf; + p = (void *)buf; len = sizeof(struct sadb_x_nat_t_frag); if (buf + len > lim) Index: policy_parse.y =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/libipsec/policy_parse.y,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- policy_parse.y 29 Jun 2005 09:12:37 -0000 1.13 +++ policy_parse.y 29 Jun 2005 11:21:31 -0000 1.14 @@ -99,7 +99,7 @@ #define ATOX(c) \ (isdigit(c) ? (c - '0') : (isupper(c) ? (c - 'A' + 10) : (c - 'a' + 10) )) -static caddr_t pbuf = NULL; /* sadb_x_policy buffer */ +static u_int8_t *pbuf = NULL; /* sadb_x_policy buffer */ static int tlen = 0; /* total length of pbuf */ static int offset = 0; /* offset of pbuf */ static int p_dir, p_type, p_protocol, p_mode, p_level, p_reqid; Index: pfkey_dump.c =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/libipsec/pfkey_dump.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- pfkey_dump.c 29 Jun 2005 09:12:37 -0000 1.13 +++ pfkey_dump.c 29 Jun 2005 11:21:31 -0000 1.14 @@ -81,6 +81,7 @@ #define GETMSGSTR(str, num) \ do { \ + /*CONSTCOND*/ \ if (sizeof((str)[0]) == 0 \ || num >= sizeof(str)/sizeof((str)[0])) \ printf("%u ", (num)); \ @@ -88,7 +89,7 @@ printf("%u ", (num)); \ else \ printf("%s ", (str)[(num)]); \ -} while (0) +} while (0/*CONSTCOND*/) #define GETMSGV2S(v2s, num) \ do { \ @@ -101,7 +102,7 @@ printf("%s ", p->str); \ else \ printf("%u ", (num)); \ -} while (0) +} while (0/*CONSTCOND*/) static char *str_ipaddr __P((struct sockaddr *)); static char *str_prefport __P((u_int, u_int, u_int, u_int)); @@ -215,10 +216,15 @@ struct sadb_sa *m_sa; struct sadb_x_sa2 *m_sa2; struct sadb_lifetime *m_lftc, *m_lfth, *m_lfts; - struct sadb_address *m_saddr, *m_daddr, *m_paddr; + struct sadb_address *m_saddr, *m_daddr; +#ifdef notdef + struct sadb_address *m_paddr; +#endif struct sadb_key *m_auth, *m_enc; +#ifdef notdef struct sadb_ident *m_sid, *m_did; struct sadb_sens *m_sens; +#endif #ifdef SADB_X_EXT_NAT_T_TYPE struct sadb_x_nat_t_type *natt_type; struct sadb_x_nat_t_port *natt_sport, *natt_dport; @@ -237,24 +243,28 @@ return; } - m_sa = (struct sadb_sa *)mhp[SADB_EXT_SA]; - m_sa2 = (struct sadb_x_sa2 *)mhp[SADB_X_EXT_SA2]; - m_lftc = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_CURRENT]; - m_lfth = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_HARD]; - m_lfts = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_SOFT]; - m_saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC]; - m_daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST]; - m_paddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_PROXY]; - m_auth = (struct sadb_key *)mhp[SADB_EXT_KEY_AUTH]; - m_enc = (struct sadb_key *)mhp[SADB_EXT_KEY_ENCRYPT]; - m_sid = (struct sadb_ident *)mhp[SADB_EXT_IDENTITY_SRC]; - m_did = (struct sadb_ident *)mhp[SADB_EXT_IDENTITY_DST]; - m_sens = (struct sadb_sens *)mhp[SADB_EXT_SENSITIVITY]; + m_sa = (void *)mhp[SADB_EXT_SA]; + m_sa2 = (void *)mhp[SADB_X_EXT_SA2]; + m_lftc = (void *)mhp[SADB_EXT_LIFETIME_CURRENT]; + m_lfth = (void *)mhp[SADB_EXT_LIFETIME_HARD]; + m_lfts = (void *)mhp[SADB_EXT_LIFETIME_SOFT]; + m_saddr = (void *)mhp[SADB_EXT_ADDRESS_SRC]; + m_daddr = (void *)mhp[SADB_EXT_ADDRESS_DST]; +#ifdef notdef + m_paddr = (void *)mhp[SADB_EXT_ADDRESS_PROXY]; +#endif + m_auth = (void *)mhp[SADB_EXT_KEY_AUTH]; + m_enc = (void *)mhp[SADB_EXT_KEY_ENCRYPT]; +#ifdef notdef + m_sid = (void *)mhp[SADB_EXT_IDENTITY_SRC]; + m_did = (void *)mhp[SADB_EXT_IDENTITY_DST]; + m_sens = (void *)mhp[SADB_EXT_SENSITIVITY]; +#endif #ifdef SADB_X_EXT_NAT_T_TYPE - natt_type = (struct sadb_x_nat_t_type *)mhp[SADB_X_EXT_NAT_T_TYPE]; - natt_sport = (struct sadb_x_nat_t_port *)mhp[SADB_X_EXT_NAT_T_SPORT]; - natt_dport = (struct sadb_x_nat_t_port *)mhp[SADB_X_EXT_NAT_T_DPORT]; - natt_oa = (struct sadb_address *)mhp[SADB_X_EXT_NAT_T_OA]; + natt_type = (void *)mhp[SADB_X_EXT_NAT_T_TYPE]; + natt_sport = (void *)mhp[SADB_X_EXT_NAT_T_SPORT]; + natt_dport = (void *)mhp[SADB_X_EXT_NAT_T_DPORT]; + natt_oa = (void *)mhp[SADB_X_EXT_NAT_T_OA]; if (natt_type && natt_type->sadb_x_nat_t_type_type) use_natt = 1; @@ -265,7 +275,7 @@ printf("no ADDRESS_SRC extension.\n"); return; } - printf("%s", str_ipaddr((struct sockaddr *)(m_saddr + 1))); + printf("%s", str_ipaddr((void *)(m_saddr + 1))); #ifdef SADB_X_EXT_NAT_T_TYPE if (use_natt && natt_sport) printf("[%u]", ntohs(natt_sport->sadb_x_nat_t_port_port)); @@ -277,7 +287,7 @@ printf(" no ADDRESS_DST extension.\n"); return; } - printf("%s", str_ipaddr((struct sockaddr *)(m_daddr + 1))); + printf("%s", str_ipaddr((void *)(m_daddr + 1))); #ifdef SADB_X_EXT_NAT_T_TYPE if (use_natt && natt_dport) printf("[%u]", ntohs(natt_dport->sadb_x_nat_t_port_port)); @@ -318,7 +328,7 @@ /* other NAT-T information */ if (use_natt && natt_oa) printf("\tNAT OA=%s\n", - str_ipaddr((struct sockaddr *)(natt_oa + 1))); + str_ipaddr((void *)(natt_oa + 1))); #endif /* encryption key */ @@ -329,7 +339,7 @@ if (m_enc != NULL) { printf("\tE: "); GETMSGV2S(str_alg_enc, m_sa->sadb_sa_encrypt); - ipsec_hexdump((caddr_t)m_enc + sizeof(*m_enc), + ipsec_hexdump((caddr_t)(void *)m_enc + sizeof(*m_enc), m_enc->sadb_key_bits / 8); printf("\n"); } @@ -339,7 +349,7 @@ if (m_auth != NULL) { printf("\tA: "); GETMSGV2S(str_alg_auth, m_sa->sadb_sa_auth); - ipsec_hexdump((caddr_t)m_auth + sizeof(*m_auth), + ipsec_hexdump((caddr_t)(void *)m_auth + sizeof(*m_auth), m_auth->sadb_key_bits / 8); printf("\n"); } @@ -360,7 +370,7 @@ time_t tmp_time = time(0); printf("\tcreated: %s", - str_time(m_lftc->sadb_lifetime_addtime)); + str_time((long)m_lftc->sadb_lifetime_addtime)); printf("\tcurrent: %s\n", str_time(tmp_time)); printf("\tdiff: %lu(s)", (u_long)(m_lftc->sadb_lifetime_addtime == 0 ? @@ -374,7 +384,7 @@ 0 : m_lfts->sadb_lifetime_addtime)); printf("\tlast: %s", - str_time(m_lftc->sadb_lifetime_usetime)); + str_time((long)m_lftc->sadb_lifetime_usetime)); printf("\thard: %lu(s)", (u_long)(m_lfth == NULL ? 0 : m_lfth->sadb_lifetime_usetime)); @@ -447,14 +457,14 @@ return; } - m_saddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_SRC]; - m_daddr = (struct sadb_address *)mhp[SADB_EXT_ADDRESS_DST]; + m_saddr = (void *)mhp[SADB_EXT_ADDRESS_SRC]; + m_daddr = (void *)mhp[SADB_EXT_ADDRESS_DST]; #ifdef SADB_X_EXT_TAG - m_tag = (struct sadb_x_tag *)mhp[SADB_X_EXT_TAG]; + m_tag = (void *)mhp[SADB_X_EXT_TAG]; #endif - m_xpl = (struct sadb_x_policy *)mhp[SADB_X_EXT_POLICY]; - m_lftc = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_CURRENT]; - m_lfth = (struct sadb_lifetime *)mhp[SADB_EXT_LIFETIME_HARD]; + m_xpl = (void *)mhp[SADB_X_EXT_POLICY]; + m_lftc = (void *)mhp[SADB_EXT_LIFETIME_CURRENT]; + m_lfth = (void *)mhp[SADB_EXT_LIFETIME_HARD]; #ifdef __linux__ /* *bsd indicates per-socket policies by omiting src and dst @@ -467,19 +477,20 @@ #endif if (m_saddr && m_daddr) { /* source address */ - sa = (struct sockaddr *)(m_saddr + 1); + sa = (void *)(m_saddr + 1); switch (sa->sa_family) { case AF_INET: case AF_INET6: - if (getnameinfo(sa, sysdep_sa_len(sa), NULL, 0, - pbuf, sizeof(pbuf), NI_NUMERICSERV) != 0) + if (getnameinfo(sa, (socklen_t)sysdep_sa_len(sa), NULL, + 0, pbuf, sizeof(pbuf), NI_NUMERICSERV) != 0) sport = 0; /*XXX*/ else sport = atoi(pbuf); printf("%s%s ", str_ipaddr(sa), - str_prefport(sa->sa_family, - m_saddr->sadb_address_prefixlen, sport, - m_saddr->sadb_address_proto)); + str_prefport((u_int)sa->sa_family, + (u_int)m_saddr->sadb_address_prefixlen, + (u_int)sport, + (u_int)m_saddr->sadb_address_proto)); break; default: printf("unknown-af "); @@ -487,19 +498,20 @@ } /* destination address */ - sa = (struct sockaddr *)(m_daddr + 1); + sa = (void *)(m_daddr + 1); switch (sa->sa_family) { case AF_INET: case AF_INET6: - if (getnameinfo(sa, sysdep_sa_len(sa), NULL, 0, - pbuf, sizeof(pbuf), NI_NUMERICSERV) != 0) + if (getnameinfo(sa, (socklen_t)sysdep_sa_len(sa), NULL, + 0, pbuf, sizeof(pbuf), NI_NUMERICSERV) != 0) dport = 0; /*XXX*/ else dport = atoi(pbuf); printf("%s%s ", str_ipaddr(sa), - str_prefport(sa->sa_family, - m_daddr->sadb_address_prefixlen, dport, - m_saddr->sadb_address_proto)); + str_prefport((u_int)sa->sa_family, + (u_int)m_daddr->sadb_address_prefixlen, + (u_int)dport, + (u_int)m_saddr->sadb_address_proto)); break; default: printf("unknown-af "); @@ -512,7 +524,8 @@ printf("upper layer protocol mismatched.\n"); return; } - str_upperspec(m_saddr->sadb_address_proto, sport, dport); + str_upperspec((u_int)m_saddr->sadb_address_proto, (u_int)sport, + (u_int)dport); } #ifdef SADB_X_EXT_TAG else if (m_tag) @@ -546,9 +559,9 @@ /* lifetime */ if (m_lftc) { printf("\tcreated: %s ", - str_time(m_lftc->sadb_lifetime_addtime)); + str_time((long)m_lftc->sadb_lifetime_addtime)); printf("lastused: %s\n", - str_time(m_lftc->sadb_lifetime_usetime)); + str_time((long)m_lftc->sadb_lifetime_usetime)); } if (m_lfth) { printf("\tlifetime: %lu(s) ", @@ -582,7 +595,8 @@ if (sa == NULL) return ""; - if (getnameinfo(sa, sysdep_sa_len(sa), buf, sizeof(buf), NULL, 0, niflag) == 0) + if (getnameinfo(sa, (socklen_t)sysdep_sa_len(sa), buf, sizeof(buf), + NULL, 0, niflag) == 0) return buf; return NULL; } @@ -647,7 +661,7 @@ printf("ip4"); break; default: - ent = getprotobynumber(ulp); + ent = getprotobynumber((int)ulp); if (ent) printf("%s", ent->p_name); else |