[ipfilter-cvs] ipfilter fil.c, ip_auth.c, ip_compat.h, ip_dstlist.c, ip_fil.h, ip_fil_solaris.c, ip
Brought to you by:
darren_r
From: Darren <dar...@us...> - 2012-08-13 11:42:04
|
Update of /cvsroot/ipfilter/ipfilter In directory vz-cvs-4.sog:/tmp/cvs-serv1746 Modified Files: fil.c ip_auth.c ip_compat.h ip_dstlist.c ip_fil.h ip_fil_solaris.c ip_frag.c ip_ftp_pxy.c ip_htable.c ip_ipsec_pxy.c ip_irc_pxy.c ip_log.c ip_lookup.c ip_lookup.h ip_nat.c ip_nat6.c ip_netbios_pxy.c ip_pool.c ip_pptp_pxy.c ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_rcmd_pxy.c ip_rpcb_pxy.c ip_state.c ip_sync.c ip_sync.h ip_tftp_pxy.c ipf_rb.h radix_ipf.c radix_ipf.h solaris.c Log Message: 3556683 lint cleanup Index: ip_auth.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_auth.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ip_auth.c 22 Jul 2012 08:02:22 -0000 1.31 --- ip_auth.c 13 Aug 2012 11:42:00 -0000 1.32 *************** *** 203,206 **** --- 203,207 ---- /* and initialise some fields to their defaults. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void * ipf_auth_soft_create(softc) *************** *** 236,239 **** --- 237,241 ---- /* rules. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_auth_soft_init(softc, arg) *************** *** 275,278 **** --- 277,281 ---- /* is free'd by _destroy(). */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_auth_soft_fini(softc, arg) *************** *** 335,338 **** --- 338,342 ---- /* Undo what was done in _create() - i.e. free the soft context data. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void ipf_auth_soft_destroy(softc, arg) *************** *** 624,628 **** else { WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); IPFERROR(10001); --- 628,632 ---- else { WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); IPFERROR(10001); Index: ip_tftp_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_tftp_pxy.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ip_tftp_pxy.c 22 Jul 2012 08:02:22 -0000 1.9 --- ip_tftp_pxy.c 13 Aug 2012 11:42:01 -0000 1.10 *************** *** 14,18 **** } ipf_tftp_softc_t; ! int ipf_p_tftp_backchannel(fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_client(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *); void ipf_p_tftp_del(ipf_main_softc_t *, ap_session_t *); --- 14,18 ---- } ipf_tftp_softc_t; ! void ipf_p_tftp_backchannel(fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_client(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *); void ipf_p_tftp_del(ipf_main_softc_t *, ap_session_t *); *************** *** 22,26 **** int ipf_p_tftp_new(void *, fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_out(void *, fr_info_t *, ap_session_t *, nat_t *); ! int ipf_p_tftp_server(ipf_tftp_softc_t *, fr_info_t *, ap_session_t *, nat_t *); void *ipf_p_tftp_soft_create(ipf_main_softc_t *); void ipf_p_tftp_soft_destroy(ipf_main_softc_t *, void *); --- 22,26 ---- int ipf_p_tftp_new(void *, fr_info_t *, ap_session_t *, nat_t *); int ipf_p_tftp_out(void *, fr_info_t *, ap_session_t *, nat_t *); ! int ipf_p_tftp_server(fr_info_t *, ap_session_t *); void *ipf_p_tftp_soft_create(ipf_main_softc_t *); void ipf_p_tftp_soft_destroy(ipf_main_softc_t *, void *); *************** *** 120,124 **** if (softt->ipf_p_tftp_tune != NULL) { ! ipf_tune_array_unlink(softc, softt->ipf_p_tftp_tune); KFREES(softt->ipf_p_tftp_tune, sizeof(ipf_tftp_tuneables)); softt->ipf_p_tftp_tune = NULL; --- 120,124 ---- if (softt->ipf_p_tftp_tune != NULL) { ! (void) ipf_tune_array_unlink(softc, softt->ipf_p_tftp_tune); KFREES(softt->ipf_p_tftp_tune, sizeof(ipf_tftp_tuneables)); softt->ipf_p_tftp_tune = NULL; *************** *** 141,145 **** if (nat->nat_dir == NAT_OUTBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(softt, fin, aps, nat); } --- 141,145 ---- if (nat->nat_dir == NAT_OUTBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(fin, aps); } *************** *** 157,164 **** if (nat->nat_dir == NAT_INBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(softt, fin, aps, nat); } int ipf_p_tftp_new(arg, fin, aps, nat) --- 157,165 ---- if (nat->nat_dir == NAT_INBOUND) return ipf_p_tftp_client(softt, fin, aps, nat); ! return ipf_p_tftp_server(fin, aps); } + /*ARGSUSED*/ int ipf_p_tftp_new(arg, fin, aps, nat) *************** *** 279,283 **** * Setup for a new TFTP proxy. */ ! int ipf_p_tftp_backchannel(fin, aps, nat) fr_info_t *fin; --- 280,284 ---- * Setup for a new TFTP proxy. */ ! void ipf_p_tftp_backchannel(fin, aps, nat) fr_info_t *fin; *************** *** 303,306 **** --- 304,309 ---- int dir; + slen = 0; + nat2 = NULL; ti = aps->aps_data; /* *************** *** 365,370 **** --- 368,375 ---- if (nat->nat_v[0] == 4) nat2 = ipf_nat_add(&fi, ti->ti_rule, NULL, nflags, dir); + #ifdef USE_INET6 else nat2 = ipf_nat6_add(&fi, ti->ti_rule, NULL, nflags, dir); + #endif MUTEX_EXIT(&softn->ipf_nat_new); if (nat2 != NULL) { *************** *** 412,416 **** #endif } - return 0; } --- 417,420 ---- *************** *** 426,430 **** tftpinfo_t *ti; u_short opcode; - udphdr_t *udp; int len; --- 430,433 ---- *************** *** 445,449 **** /* FALLTHROUGH */ case TFTP_CMD_READ : ! len = fin->fin_dlen - sizeof(*udp) - 2; if (len > sizeof(ti->ti_filename) - 1) len = sizeof(ti->ti_filename) - 1; --- 448,452 ---- /* FALLTHROUGH */ case TFTP_CMD_READ : ! len = fin->fin_dlen - sizeof(udphdr_t) - 2; if (len > sizeof(ti->ti_filename) - 1) len = sizeof(ti->ti_filename) - 1; *************** *** 466,475 **** int ! ipf_p_tftp_server(softt, fin, aps, nat) ! ipf_tftp_softc_t *softt; fr_info_t *fin; ap_session_t *aps; - nat_t *nat; { tftpinfo_t *ti; --- 469,477 ---- + /*ARGSUSED*/ int ! ipf_p_tftp_server(fin, aps) fr_info_t *fin; ap_session_t *aps; { tftpinfo_t *ti; Index: ip_pool.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_pool.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ip_pool.c 22 Jul 2012 07:58:03 -0000 1.41 --- ip_pool.c 13 Aug 2012 11:42:01 -0000 1.42 *************** *** 294,297 **** --- 294,298 ---- /* Initialise the routing table data structures where required. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_pool_soft_init(softc, arg) *************** *** 347,350 **** --- 348,352 ---- /* up the pool context too. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_pool_soft_destroy(softc, arg) *************** *** 371,374 **** --- 373,377 ---- /* the address prior to calling for the pair to be added. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_pool_node_add(softc, arg, op, uid) *************** *** 738,742 **** /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ ! extern void printhostmask(int, u_32_t *, u_32_t *); static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) --- 741,745 ---- /* Searches for an exact match of an entry in the pool. */ /* ------------------------------------------------------------------------ */ ! /*ARGSUSED*/ static ip_pool_node_t * ipf_pool_findeq(softp, ipo, addr, mask) *************** *** 1212,1216 **** for (next = &ipo->ipo_list; (n = *next) != NULL; ) ! ipf_pool_remove_node(softc, softp, ipo, n); ipo->ipo_list = NULL; --- 1215,1219 ---- for (next = &ipo->ipo_list; (n = *next) != NULL; ) ! (void) ipf_pool_remove_node(softc, softp, ipo, n); ipo->ipo_list = NULL; *************** *** 1242,1246 **** else if ((ipo->ipo_ref == 1) && (ipo->ipo_flags & IPOOL_DELETE)) ! ipf_pool_destroy(softc, arg, ipo->ipo_unit, ipo->ipo_name); return 0; --- 1245,1250 ---- else if ((ipo->ipo_ref == 1) && (ipo->ipo_flags & IPOOL_DELETE)) ! (void) ipf_pool_destroy(softc, arg, ipo->ipo_unit, ! ipo->ipo_name); return 0; *************** *** 1372,1376 **** if (ipo != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_pool_deref(softc, softp, ipo); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1376,1380 ---- if (ipo != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_pool_deref(softc, softp, ipo); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1425,1429 **** { case IPFLOOKUPITER_LIST : ! ipf_pool_deref(softc, softp, (ip_pool_t *)data); break; --- 1429,1433 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_pool_deref(softc, softp, (ip_pool_t *)data); break; *************** *** 1463,1467 **** if (n->ipn_die > softc->ipf_ticks) break; ! ipf_pool_remove_node(softc, softp, n->ipn_owner, n); } } --- 1467,1471 ---- if (n->ipn_die > softc->ipf_ticks) break; ! (void) ipf_pool_remove_node(softc, softp, n->ipn_owner, n); } } Index: solaris.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/solaris.c,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** solaris.c 22 Jul 2012 08:02:22 -0000 1.38 --- solaris.c 13 Aug 2012 11:42:01 -0000 1.39 *************** *** 233,238 **** #endif if (rval == 0) { ! ipf_unload_all(); ! ipf_stack_fini(); } return rval; --- 233,241 ---- #endif if (rval == 0) { ! rval = ipf_unload_all(); ! if (rval == 0) ! ipf_stack_fini(); ! else ! (void) mod_install(&modlink1); } return rval; *************** *** 439,443 **** rval = ipf_stack_init(); if (rval != 0) { ! ipf_unload_all(); return rval; } --- 442,446 ---- rval = ipf_stack_init(); if (rval != 0) { ! rval = ipf_unload_all(); return rval; } *************** *** 563,567 **** int revents = 0; ! if (xmin < 0 || xmin > IPL_LOGMAX) return ENXIO; --- 566,570 ---- int revents = 0; ! if (xmin > IPL_LOGMAX) return ENXIO; *************** *** 814,817 **** --- 817,821 ---- + /*ARGSUSED*/ int ipf_hk_v4_in(tok, data, arg) *************** *** 852,855 **** --- 856,860 ---- + /*ARGSUSED*/ int ipf_hk_v4_out(tok, data, arg) *************** *** 890,893 **** --- 895,899 ---- + /*ARGSUSED*/ int ipf_hk_v4_nic(tok, data, arg) *************** *** 925,928 **** --- 931,935 ---- + /*ARGSUSED*/ int ipf_hk_v6_in(tok, data, arg) *************** *** 962,965 **** --- 969,973 ---- + /*ARGSUSED*/ int ipf_hk_v6_out(tok, data, arg) *************** *** 999,1002 **** --- 1007,1011 ---- + /*ARGSUSED*/ int ipf_hk_v6_nic(tok, data, arg) *************** *** 1006,1010 **** { hook_nic_event_t *nic = (hook_nic_event_t *)data; - ipf_main_softc_t *softc = (ipf_main_softc_t *)arg; switch (nic->hne_event) --- 1015,1018 ---- *************** *** 1054,1057 **** --- 1062,1066 ---- + /*ARGSUSED*/ static void ipf_instance_shutdown(netid_t id, void *arg) *************** *** 1063,1066 **** --- 1072,1076 ---- + /*ARGSUSED*/ static void ipf_instance_destroy(netid_t id, void *arg) *************** *** 1096,1100 **** ipf_stack_fini() { ! net_instance_unregister(ipf_inst); net_instance_free(ipf_inst); ipf_inst = NULL; --- 1106,1110 ---- ipf_stack_fini() { ! (void) net_instance_unregister(ipf_inst); net_instance_free(ipf_inst); ipf_inst = NULL; *************** *** 1168,1172 **** hook_free(softc->ipf_hk_v4_nic); ! net_protocol_release(softc->ipf_nd_v4); softc->ipf_nd_v4 = NULL; } --- 1178,1182 ---- hook_free(softc->ipf_hk_v4_nic); ! (void) net_protocol_release(softc->ipf_nd_v4); softc->ipf_nd_v4 = NULL; } *************** *** 1188,1192 **** hook_free(softc->ipf_hk_v6_nic); ! net_protocol_release(softc->ipf_nd_v6); softc->ipf_nd_v6 = NULL; } --- 1198,1202 ---- hook_free(softc->ipf_hk_v6_nic); ! (void) net_protocol_release(softc->ipf_nd_v6); softc->ipf_nd_v6 = NULL; } Index: ip_ipsec_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_ipsec_pxy.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ip_ipsec_pxy.c 22 Jul 2012 08:02:22 -0000 1.20 --- ip_ipsec_pxy.c 13 Aug 2012 11:42:01 -0000 1.21 *************** *** 41,44 **** --- 41,45 ---- * IPSec application proxy initialization. */ + /*ARGSUSED*/ void * ipf_p_ipsec_soft_create(softc) *************** *** 88,91 **** --- 89,93 ---- + /*ARGSUSED*/ void ipf_p_ipsec_soft_fini(softc, arg) *************** *** 111,114 **** --- 113,117 ---- + /*ARGSUSED*/ void ipf_p_ipsec_soft_destroy(softc, arg) Index: ip_dstlist.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_dstlist.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** ip_dstlist.c 22 Jul 2012 08:02:22 -0000 1.24 --- ip_dstlist.c 13 Aug 2012 11:42:00 -0000 1.25 *************** *** 174,177 **** --- 174,178 ---- /* soft context is free it! */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_soft_destroy(softc, arg) *************** *** 193,196 **** --- 194,198 ---- /* There is currently no soft context for destination list management. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_dstlist_soft_init(softc, arg) *************** *** 210,213 **** --- 212,216 ---- /* There is currently no soft context for destination list management. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_soft_fini(softc, arg) *************** *** 329,337 **** { case IPFLOOKUPITER_LIST : ! ipf_dstlist_table_deref(softc, arg, (ippool_dst_t *)data); break; case IPFLOOKUPITER_NODE : ! ipf_dstlist_node_deref(arg, (ipf_dstnode_t *)data); break; } --- 332,340 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_dstlist_table_deref(softc, arg,(ippool_dst_t *)data); break; case IPFLOOKUPITER_NODE : ! (void) ipf_dstlist_node_deref(arg, (ipf_dstnode_t *)data); break; } *************** *** 434,438 **** case IPFLOOKUPITER_LIST : if (dsttab != NULL) ! ipf_dstlist_table_deref(softc, arg, dsttab); err = COPYOUT(next, iter->ili_data, sizeof(*next)); if (err != 0) { --- 437,441 ---- case IPFLOOKUPITER_LIST : if (dsttab != NULL) ! (void) ipf_dstlist_table_deref(softc, arg, dsttab); err = COPYOUT(next, iter->ili_data, sizeof(*next)); if (err != 0) { *************** *** 444,448 **** case IPFLOOKUPITER_NODE : if (node != NULL) ! ipf_dstlist_node_deref(arg, node); err = COPYOUT(nextnode, iter->ili_data, sizeof(*nextnode)); if (err != 0) { --- 447,451 ---- case IPFLOOKUPITER_NODE : if (node != NULL) ! (void) ipf_dstlist_node_deref(arg, node); err = COPYOUT(nextnode, iter->ili_data, sizeof(*nextnode)); if (err != 0) { *************** *** 602,606 **** /* ------------------------------------------------------------------------ */ /* Function: ipf_dstlist_node_deref */ ! /* Returns: int - 0 = success, else error */ /* Parameters: arg(I) - pointer to local context to use */ /* node(I) - pointer to destionation node to free */ --- 605,609 ---- /* ------------------------------------------------------------------------ */ /* Function: ipf_dstlist_node_deref */ ! /* Returns: int - 0 = success, else current reference count */ /* Parameters: arg(I) - pointer to local context to use */ /* node(I) - pointer to destionation node to free */ *************** *** 624,628 **** if (ref > 0) ! return 0; if ((node->ipfd_flags & IPDST_DELETE) != 0) --- 627,631 ---- if (ref > 0) ! return ref; if ((node->ipfd_flags & IPDST_DELETE) != 0) *************** *** 755,759 **** } ! ipf_dstlist_node_deref(softd, node); } --- 758,762 ---- } ! (void) ipf_dstlist_node_deref(softd, node); } *************** *** 858,862 **** MUTEX_INIT(&new->ipld_lock, "ipf dst table lock"); ! strncpy(new->ipld_name, op->iplo_name, FR_GROUPLEN); unit = op->iplo_unit; new->ipld_unit = unit; --- 861,865 ---- MUTEX_INIT(&new->ipld_lock, "ipf dst table lock"); ! (void) strncpy(new->ipld_name, op->iplo_name, FR_GROUPLEN); unit = op->iplo_unit; new->ipld_unit = unit; *************** *** 945,949 **** d->ipld_flags |= IPDST_DELETE; ! ipf_dstlist_table_deref(softc, softd, d); } --- 948,952 ---- d->ipld_flags |= IPDST_DELETE; ! (void) ipf_dstlist_table_deref(softc, softd, d); } *************** *** 990,993 **** --- 993,997 ---- /* it if 0 has been reached. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_dstlist_table_deref(softc, arg, table) *************** *** 1297,1300 **** --- 1301,1305 ---- /* There are currently no objects to expire in destination lists. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_dstlist_expire(softc, arg) Index: fil.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/fil.c,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** fil.c 22 Jul 2012 08:02:22 -0000 1.126 --- fil.c 13 Aug 2012 11:42:00 -0000 1.127 *************** *** 147,156 **** #define LBUMP(x) softc->x++ ! #define LBUMPD(x, y) do { softc->x.y++; DT(y); } while (0) static INLINE int ipf_check_ipf(fr_info_t *, frentry_t *, int); static u_32_t ipf_checkcipso(fr_info_t *, u_char *, int); static u_32_t ipf_checkripso(u_char *); ! static u_32_t ipf_decaps(fr_info_t *, u_32_t, int); #ifdef IPFILTER_LOG static frentry_t *ipf_dolog(fr_info_t *, u_32_t *); --- 147,160 ---- #define LBUMP(x) softc->x++ ! #define LBUMPD(x, y) do { \ ! softc->x.y++; \ ! DT(y); \ ! _NOTE(CONSTCOND) \ ! } while (0) static INLINE int ipf_check_ipf(fr_info_t *, frentry_t *, int); static u_32_t ipf_checkcipso(fr_info_t *, u_char *, int); static u_32_t ipf_checkripso(u_char *); ! static u_32_t ipf_decaps(fr_info_t *, u_32_t); #ifdef IPFILTER_LOG static frentry_t *ipf_dolog(fr_info_t *, u_32_t *); *************** *** 188,193 **** static INLINE int ipf_pr_tcpcommon(fr_info_t *); static INLINE int ipf_pr_udpcommon(fr_info_t *); ! static void ipf_rule_delete(ipf_main_softc_t *, frentry_t *f, ! int, int); static void ipf_rule_expire_insert(ipf_main_softc_t *, frentry_t *, int); --- 192,196 ---- static INLINE int ipf_pr_tcpcommon(fr_info_t *); static INLINE int ipf_pr_udpcommon(fr_info_t *); ! static void ipf_rule_delete(ipf_main_softc_t *, frentry_t *f); static void ipf_rule_expire_insert(ipf_main_softc_t *, frentry_t *, int); *************** *** 968,972 **** fin->fin_p = IPPROTO_ICMPV6; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 971,975 ---- fin->fin_p = IPPROTO_ICMPV6; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 992,996 **** fin->fin_p = IPPROTO_UDP; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 995,999 ---- fin->fin_p = IPPROTO_UDP; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1016,1020 **** fin->fin_p = IPPROTO_TCP; ! ipf_checkv6sum(fin); fin->fin_p = p; } --- 1019,1023 ---- fin->fin_p = IPPROTO_TCP; ! (void) ipf_checkv6sum(fin); fin->fin_p = p; } *************** *** 1260,1263 **** --- 1263,1267 ---- fin->fin_flx |= FI_BAD; } + /*FALLTHROUGH*/ #endif case ICMP_SOURCEQUENCH : *************** *** 1294,1298 **** ipf_pr_short(fin, minicmpsz); ! ipf_checkv4sum(fin); } --- 1298,1302 ---- ipf_pr_short(fin, minicmpsz); ! (void) ipf_checkv4sum(fin); } *************** *** 1455,1458 **** --- 1459,1463 ---- */ /*fin->fin_flx |= FI_BAD*/; + fin->fin_flx = fin->fin_flx; /* LINT */ } else if (!(flags & (TH_RST|TH_SYN))) { fin->fin_flx |= FI_BAD; *************** *** 1611,1615 **** if (ipf_pr_tcpcommon(fin) == 0) ! ipf_checkv4sum(fin); } --- 1616,1620 ---- if (ipf_pr_tcpcommon(fin) == 0) ! (void) ipf_checkv4sum(fin); } *************** *** 1631,1635 **** if (ipf_pr_udpcommon(fin) == 0) ! ipf_checkv4sum(fin); } --- 1636,1640 ---- if (ipf_pr_udpcommon(fin) == 0) ! (void) ipf_checkv4sum(fin); } *************** *** 2068,2072 **** } else if (tag > 127) { /* Custom defined DOI */ ! ; } else { fin->fin_flx |= FI_BAD; --- 2073,2077 ---- } else if (tag > 127) { /* Custom defined DOI */ ! fin->fin_flx = fin->fin_flx; /* LINT */ } else { fin->fin_flx |= FI_BAD; *************** *** 2633,2637 **** if (FR_ISDECAPS(passt)) ! passt = ipf_decaps(fin, pass, fr->fr_icode); else passt = ipf_scanlist(fin, pass); --- 2638,2642 ---- if (FR_ISDECAPS(passt)) ! passt = ipf_decaps(fin, pass); else passt = ipf_scanlist(fin, pass); *************** *** 3124,3128 **** case 4 : if (ipf_nat_checkout(fin, &pass) == -1) { ! ; } else if ((softc->ipf_update_ipid != 0) && (v == 4)) { if (ipf_updateipid(fin) == -1) { --- 3129,3133 ---- case 4 : if (ipf_nat_checkout(fin, &pass) == -1) { ! pass = pass; /* LINT */ } else if ((softc->ipf_update_ipid != 0) && (v == 4)) { if (ipf_updateipid(fin) == -1) { *************** *** 3250,3254 **** mc = M_COPY(fin->fin_m); if (mc != NULL) ! ipf_fastroute(mc, &mc, fin, fdp); } --- 3255,3259 ---- mc = M_COPY(fin->fin_m); if (mc != NULL) ! (void) ipf_fastroute(mc, &mc, fin, fdp); } *************** *** 3264,3268 **** (fdp->fd_ptr != (struct ifnet *)-1)) { /* this is for to rules: */ ! ipf_fastroute(fin->fin_m, mp, fin, fdp); m = *mp = NULL; } --- 3269,3273 ---- (fdp->fd_ptr != (struct ifnet *)-1)) { /* this is for to rules: */ ! (void) ipf_fastroute(fin->fin_m, mp, fin, fdp); m = *mp = NULL; } *************** *** 3625,3630 **** /* Function: ipf_group_del */ /* Returns: int - number of rules deleted */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* group(I) - group name to delete */ /* fr(I) - filter rule from which group is referenced */ /* Write Locks: ipf_mutex */ --- 3630,3634 ---- /* Function: ipf_group_del */ /* Returns: int - number of rules deleted */ ! /* Parameters: group(I) - group name to delete */ /* fr(I) - filter rule from which group is referenced */ /* Write Locks: ipf_mutex */ *************** *** 3636,3641 **** /* ------------------------------------------------------------------------ */ void ! ipf_group_del(softc, group, fr) ! ipf_main_softc_t *softc; frgroup_t *group; frentry_t *fr; --- 3640,3644 ---- /* ------------------------------------------------------------------------ */ void ! ipf_group_del(group, fr) frgroup_t *group; frentry_t *fr; *************** *** 3814,3823 **** if (flags & FR_OUTQUE) { ! ipf_flushlist(softc, &flushed, &softc->ipf_rules[1][set]); ! ipf_flushlist(softc, &flushed, &softc->ipf_acct[1][set]); } if (flags & FR_INQUE) { ! ipf_flushlist(softc, &flushed, &softc->ipf_rules[0][set]); ! ipf_flushlist(softc, &flushed, &softc->ipf_acct[0][set]); } --- 3817,3826 ---- if (flags & FR_OUTQUE) { ! (void) ipf_flushlist(softc, &flushed,&softc->ipf_rules[1][set]); ! (void) ipf_flushlist(softc, &flushed, &softc->ipf_acct[1][set]); } if (flags & FR_INQUE) { ! (void) ipf_flushlist(softc, &flushed,&softc->ipf_rules[0][set]); ! (void) ipf_flushlist(softc, &flushed, &softc->ipf_acct[0][set]); } *************** *** 4044,4049 **** ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! ipf_ifpaddr(softc, v, fr->fr_satype, ifa, ! &fr->fr_src6, &fr->fr_smsk6); } if (fr->fr_datype != FRI_NORMAL && --- 4047,4052 ---- ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! (void) ipf_ifpaddr(softc, v, fr->fr_satype, ifa, ! &fr->fr_src6, &fr->fr_smsk6); } if (fr->fr_datype != FRI_NORMAL && *************** *** 4051,4056 **** ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! ipf_ifpaddr(softc, v, fr->fr_datype, ifa, ! &fr->fr_dst6, &fr->fr_dmsk6); } } --- 4054,4059 ---- ifa = ipf_resolvenic(softc, fr->fr_names + fr->fr_sifpidx, v); ! (void) ipf_ifpaddr(softc, v, fr->fr_datype, ifa, ! &fr->fr_dst6, &fr->fr_dmsk6); } } *************** *** 4121,4125 **** /* needs to be changed/updated. */ /* ------------------------------------------------------------------------ */ ! int ipf_sync(softc, ifp) ipf_main_softc_t *softc; --- 4124,4128 ---- /* needs to be changed/updated. */ /* ------------------------------------------------------------------------ */ ! void ipf_sync(softc, ifp) ipf_main_softc_t *softc; *************** *** 4149,4154 **** } RWLOCK_EXIT(&softc->ipf_mutex); - - return 0; } --- 4152,4155 ---- *************** *** 4454,4458 **** int error = 0, in, family, addrem, need_free = 0; frentry_t frd, *fp, *f, **fprev, **ftail; ! void *ptr, *uptr, *cptr; u_int *p, *pp; frgroup_t *fg; --- 4455,4459 ---- int error = 0, in, family, addrem, need_free = 0; frentry_t frd, *fp, *f, **fprev, **ftail; ! void *ptr, *uptr; u_int *p, *pp; frgroup_t *fg; *************** *** 4460,4464 **** ptr = NULL; - cptr = NULL; fg = NULL; fp = &frd; --- 4461,4464 ---- *************** *** 4570,4574 **** ptr = NULL; - cptr = NULL; if (FR_ISACCOUNT(fp->fr_flags)) --- 4570,4573 ---- *************** *** 5055,5059 **** } ! ipf_rule_delete(softc, f, unit, set); need_free = makecopy; --- 5054,5058 ---- } ! ipf_rule_delete(softc, f); need_free = makecopy; *************** *** 5116,5120 **** if (fp->fr_grp != NULL) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(softc, fp->fr_grp, fp); RWLOCK_EXIT(&softc->ipf_mutex); } --- 5115,5119 ---- if (fp->fr_grp != NULL) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(fp->fr_grp, fp); RWLOCK_EXIT(&softc->ipf_mutex); } *************** *** 5134,5139 **** /* f(I) - pointer to the rule being deleted */ /* ftail(I) - pointer to the pointer to f */ - /* unit(I) - device for which this is for */ - /* set(I) - 1 or 0 (filter set) */ /* */ /* This function attempts to do what it can to delete a filter rule: remove */ --- 5133,5136 ---- *************** *** 5143,5150 **** /* ------------------------------------------------------------------------ */ static void ! ipf_rule_delete(softc, f, unit, set) ipf_main_softc_t *softc; frentry_t *f; - int unit, set; { --- 5140,5146 ---- /* ------------------------------------------------------------------------ */ static void ! ipf_rule_delete(softc, f) ipf_main_softc_t *softc; frentry_t *f; { *************** *** 5502,5512 **** if (fr->fr_grp != NULL) ! ipf_group_del(softc, fr->fr_grp, fr); if (fr->fr_grphead != NULL) ! ipf_group_del(softc, fr->fr_grphead, fr); if (fr->fr_icmpgrp != NULL) ! ipf_group_del(softc, fr->fr_icmpgrp, fr); if ((fr->fr_flags & FR_COPIED) != 0) { --- 5498,5508 ---- if (fr->fr_grp != NULL) ! ipf_group_del(fr->fr_grp, fr); if (fr->fr_grphead != NULL) ! ipf_group_del(fr->fr_grphead, fr); if (fr->fr_icmpgrp != NULL) ! ipf_group_del(fr->fr_icmpgrp, fr); if ((fr->fr_flags & FR_COPIED) != 0) { *************** *** 6193,6198 **** case IPL_LOGSYNC : if (softc->ipf_running > 0) { ! error = ipf_sync_ioctl(softc, data, cmd, mode, ! uid, ctx); } else { error = EIO; --- 6189,6193 ---- case IPL_LOGSYNC : if (softc->ipf_running > 0) { ! error = ipf_sync_ioctl(softc, data, cmd); } else { error = EIO; *************** *** 6214,6219 **** case IPL_LOGLOOKUP : if (softc->ipf_running > 0) { ! error = ipf_lookup_ioctl(softc, data, cmd, mode, ! uid, ctx); } else { error = EIO; --- 6209,6213 ---- case IPL_LOGLOOKUP : if (softc->ipf_running > 0) { ! error = ipf_lookup_ioctl(softc, data, cmd, uid, ctx); } else { error = EIO; *************** *** 7510,7514 **** break; ! ipf_token_deref(softc, it); } RWLOCK_EXIT(&softc->ipf_tokens); --- 7504,7508 ---- break; ! (void) ipf_token_deref(softc, it); } RWLOCK_EXIT(&softc->ipf_tokens); *************** *** 7574,7578 **** uid == it->ipt_uid) { it->ipt_complete = 2; ! ipf_token_deref(softc, it); error = 0; break; --- 7568,7572 ---- uid == it->ipt_uid) { it->ipt_complete = 2; ! (void) ipf_token_deref(softc, it); error = 0; break; *************** *** 7991,7995 **** error = ipf_getnextrule(softc, token, data); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 7985,7989 ---- error = ipf_getnextrule(softc, token, data); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 8086,8090 **** if ((grp != NULL) && (next != &zero)) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(softc, grp, NULL); RWLOCK_EXIT(&softc->ipf_mutex); } --- 8080,8084 ---- if ((grp != NULL) && (next != &zero)) { WRITE_ENTER(&softc->ipf_mutex); ! ipf_group_del(grp, NULL); RWLOCK_EXIT(&softc->ipf_mutex); } *************** *** 8157,8161 **** error = ipf_geniter(softc, token, &iter); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 8151,8155 ---- error = ipf_geniter(softc, token, &iter); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 8476,8480 **** /* Parameters: fin(I) - pointer to packet information */ /* pass(I) - IP protocol version to match */ - /* l5proto(I) - layer 5 protocol to decode UDP data as. */ /* */ /* This function is called for packets that are wrapt up in other packets, */ --- 8470,8473 ---- *************** *** 8485,8492 **** /* ------------------------------------------------------------------------ */ u_32_t ! ipf_decaps(fin, pass, l5proto) fr_info_t *fin; u_32_t pass; - int l5proto; { fr_info_t fin2, *fino = NULL; --- 8478,8484 ---- /* ------------------------------------------------------------------------ */ u_32_t ! ipf_decaps(fin, pass) fr_info_t *fin; u_32_t pass; { fr_info_t fin2, *fino = NULL; *************** *** 8639,8643 **** pass |= FR_BLOCK|FR_QUICK; fin->fin_reason = FRB_DECAPFRIP; ! return -1; } --- 8631,8635 ---- pass |= FR_BLOCK|FR_QUICK; fin->fin_reason = FRB_DECAPFRIP; ! return pass; } *************** *** 8874,8879 **** rv |= ((fin->fin_saddr & e->ipfe_arg0[i * 2 + 1]) == ! e->ipfe_arg0[i * 2]) || ! ((fin->fin_daddr & e->ipfe_arg0[i * 2 + 1]) == e->ipfe_arg0[i * 2]); --- 8866,8871 ---- rv |= ((fin->fin_saddr & e->ipfe_arg0[i * 2 + 1]) == ! e->ipfe_arg0[i * 2]); ! rv |= ((fin->fin_daddr & e->ipfe_arg0[i * 2 + 1]) == e->ipfe_arg0[i * 2]); *************** *** 8908,8913 **** rv |= IP6_MASKEQ(&fin->fin_src6, &e->ipfe_arg0[i * 8 + 4], ! &e->ipfe_arg0[i * 8]) || ! IP6_MASKEQ(&fin->fin_dst6, &e->ipfe_arg0[i * 8 + 4], &e->ipfe_arg0[i * 8]); --- 8900,8905 ---- rv |= IP6_MASKEQ(&fin->fin_src6, &e->ipfe_arg0[i * 8 + 4], ! &e->ipfe_arg0[i * 8]); ! rv |= IP6_MASKEQ(&fin->fin_dst6, &e->ipfe_arg0[i * 8 + 4], &e->ipfe_arg0[i * 8]); *************** *** 8919,8924 **** case IPF_EXP_TCP_PORT : for (i = 0; !rv && i < e->ipfe_narg; i++) { ! rv |= (fin->fin_sport == e->ipfe_arg0[i]) || ! (fin->fin_dport == e->ipfe_arg0[i]); } break; --- 8911,8916 ---- case IPF_EXP_TCP_PORT : for (i = 0; !rv && i < e->ipfe_narg; i++) { ! rv |= ((fin->fin_sport == e->ipfe_arg0[i]) || ! (fin->fin_dport == e->ipfe_arg0[i])); } break; *************** *** 9812,9816 **** if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr, IPL_LOGIPF, 0); } --- 9804,9808 ---- if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr); } *************** *** 9822,9826 **** if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr, IPL_LOGIPF, 1); } --- 9814,9818 ---- if (fr->fr_die > softc->ipf_ticks) break; ! ipf_rule_delete(softc, fr); } *************** *** 10081,10084 **** --- 10073,10077 ---- /* Free an actual host_node_t structure. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ void ipf_rb_ht_freenode(node, arg) Index: ip_netbios_pxy.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_netbios_pxy.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ip_netbios_pxy.c 29 Jul 2009 06:13:00 -0000 1.5 --- ip_netbios_pxy.c 13 Aug 2012 11:42:01 -0000 1.6 *************** *** 67,70 **** --- 67,71 ---- + /*ARGSUSED*/ int ipf_p_netbios_out(arg, fin, aps, nat) Index: ip_htable.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_htable.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ip_htable.c 22 Jul 2012 08:02:22 -0000 1.32 --- ip_htable.c 13 Aug 2012 11:42:01 -0000 1.33 *************** *** 60,64 **** static iphtent_t *ipf_iphmfind(iphtable_t *, struct in_addr *); static int ipf_iphmfindip(ipf_main_softc_t *, void *, int, void *, u_int); ! static int ipf_htable_clear(ipf_main_softc_t *, void *, iphtable_t *); static int ipf_htable_create(ipf_main_softc_t *, void *, iplookupop_t *); static int ipf_htable_deref(ipf_main_softc_t *, void *, void *); --- 60,64 ---- static iphtent_t *ipf_iphmfind(iphtable_t *, struct in_addr *); static int ipf_iphmfindip(ipf_main_softc_t *, void *, int, void *, u_int); ! static int ipf_htable_clear(void *, iphtable_t *); static int ipf_htable_create(ipf_main_softc_t *, void *, iplookupop_t *); static int ipf_htable_deref(ipf_main_softc_t *, void *, void *); *************** *** 84,89 **** static int ipf_htent_insert(ipf_main_softc_t *, void *, iphtable_t *, iphtent_t *); ! static int ipf_htent_remove(ipf_main_softc_t *, void *, iphtable_t *, ! iphtent_t *); static void *ipf_htable_select_add_ref(void *, int, char *); static void ipf_htable_expire(ipf_main_softc_t *, void *); --- 84,88 ---- static int ipf_htent_insert(ipf_main_softc_t *, void *, iphtable_t *, iphtent_t *); ! static int ipf_htent_remove(void *, iphtable_t *, iphtent_t *); static void *ipf_htable_select_add_ref(void *, int, char *); static void ipf_htable_expire(ipf_main_softc_t *, void *); *************** *** 156,159 **** --- 155,159 ---- /* up the pool context too. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static void ipf_htable_soft_destroy(softc, arg) *************** *** 175,178 **** --- 175,179 ---- /* Initialise the hash table ready for use. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_htable_soft_init(softc, arg) *************** *** 211,215 **** fop.iplf_count = 0; *fop.iplf_name = '\0'; ! ipf_htable_flush(softc, arg, &fop); } --- 212,216 ---- fop.iplf_count = 0; *fop.iplf_name = '\0'; ! (void) ipf_htable_flush(softc, arg, &fop); } *************** *** 423,432 **** if (iph->iph_ref != 0) { ! ipf_htable_clear(softc, arg, iph); iph->iph_flags |= IPHASH_DELETE; return 0; } ! ipf_htable_remove(softc, arg, iph); return 0; --- 424,433 ---- if (iph->iph_ref != 0) { ! (void) ipf_htable_clear(arg, iph); iph->iph_flags |= IPHASH_DELETE; return 0; } ! (void) ipf_htable_remove(softc, arg, iph); return 0; *************** *** 437,442 **** /* Function: ipf_htable_clear */ /* Returns: int - 0 = success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table to destroy */ /* */ --- 438,442 ---- /* Function: ipf_htable_clear */ /* Returns: int - 0 = success, else error */ ! /* Parameters: arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table to destroy */ /* */ *************** *** 445,450 **** /* ------------------------------------------------------------------------ */ static int ! ipf_htable_clear(softc, arg, iph) ! ipf_main_softc_t *softc; void *arg; iphtable_t *iph; --- 445,449 ---- /* ------------------------------------------------------------------------ */ static int ! ipf_htable_clear(arg, iph) void *arg; iphtable_t *iph; *************** *** 453,457 **** while ((ipe = iph->iph_list) != NULL) ! if (ipf_htent_remove(softc, arg, iph, ipe) != 0) return 1; return 0; --- 452,456 ---- while ((ipe = iph->iph_list) != NULL) ! if (ipf_htent_remove(arg, iph, ipe) != 0) return 1; return 0; *************** *** 504,508 **** { ! if (ipf_htable_clear(softc, arg, iph) != 0) return 1; --- 503,507 ---- { ! if (ipf_htable_clear(arg, iph) != 0) return 1; *************** *** 566,570 **** } ! err = ipf_htent_remove(softc, arg, iph, ent); return err; --- 565,569 ---- } ! err = ipf_htent_remove(arg, iph, ent); return err; *************** *** 602,607 **** /* Function: ipf_htent_remove */ /* Returns: int - 0 = success, else error */ ! /* Parameters: softc(I) - pointer to soft context main structure */ ! /* arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table */ /* ipe(I) - pointer to hash table entry to remove */ --- 601,605 ---- /* Function: ipf_htent_remove */ /* Returns: int - 0 = success, else error */ ! /* Parameters: arg(I) - pointer to local context to use */ /* iph(I) - pointer to hash table */ /* ipe(I) - pointer to hash table entry to remove */ *************** *** 610,615 **** /* ------------------------------------------------------------------------ */ static int ! ipf_htent_remove(softc, arg, iph, ipe) ! ipf_main_softc_t *softc; void *arg; iphtable_t *iph; --- 608,612 ---- /* ------------------------------------------------------------------------ */ static int ! ipf_htent_remove(arg, iph, ipe) void *arg; iphtable_t *iph; *************** *** 645,649 **** case IPHASH_GROUPMAP : if (ipe->ipe_group != NULL) ! ipf_group_del(softc, ipe->ipe_ptr, NULL); break; --- 642,646 ---- case IPHASH_GROUPMAP : if (ipe->ipe_group != NULL) ! ipf_group_del(ipe->ipe_ptr, NULL); break; *************** *** 666,669 **** --- 663,667 ---- /* */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ static int ipf_htable_deref(softc, arg, object) *************** *** 1038,1042 **** iphtent_t ipe, *ent; u_int hv; - int bits; bcopy((char *)ipeo, (char *)&ipe, sizeof(ipe)); --- 1036,1039 ---- *************** *** 1046,1050 **** ipe.ipe_addr.i6[3] &= ipe.ipe_mask.i6[3]; if (ipe.ipe_family == AF_INET) { - bits = count4bits(ipe.ipe_mask.in4_addr); ipe.ipe_addr.i6[1] = 0; ipe.ipe_addr.i6[2] = 0; --- 1043,1046 ---- *************** *** 1058,1062 **** #ifdef USE_INET6 if (ipe.ipe_family == AF_INET6) { - bits = count6bits(ipe.ipe_mask.i6); hv = IPE_V6_HASH_FN(ipe.ipe_addr.i6, ipe.ipe_mask.i6, iph->iph_size); --- 1054,1057 ---- *************** *** 1305,1309 **** if (iph != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_htable_deref(softc, softh, iph); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1300,1304 ---- if (iph != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_htable_deref(softc, softh, iph); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1318,1322 **** if (node != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! ipf_htent_deref(softc, node); RWLOCK_EXIT(&softc->ipf_poolrw); } --- 1313,1317 ---- if (node != NULL) { WRITE_ENTER(&softc->ipf_poolrw); ! (void) ipf_htent_deref(softc, node); RWLOCK_EXIT(&softc->ipf_poolrw); } *************** *** 1359,1367 **** { case IPFLOOKUPITER_LIST : ! ipf_htable_deref(softc, arg, (iphtable_t *)data); break; case IPFLOOKUPITER_NODE : ! ipf_htent_deref(arg, (iphtent_t *)data); break; default : --- 1354,1362 ---- { case IPFLOOKUPITER_LIST : ! (void) ipf_htable_deref(softc, arg, (iphtable_t *)data); break; case IPFLOOKUPITER_NODE : ! (void) ipf_htent_deref(arg, (iphtent_t *)data); break; default : *************** *** 1430,1434 **** break; ! ipf_htent_remove(softc, softh, n->ipe_owner, n); } } --- 1425,1429 ---- break; ! (void) ipf_htent_remove(softh, n->ipe_owner, n); } } Index: ip_sync.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_sync.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ip_sync.c 22 Jul 2012 08:02:22 -0000 1.26 --- ip_sync.c 13 Aug 2012 11:42:01 -0000 1.27 *************** *** 182,185 **** --- 182,186 ---- /* any data structures, as required. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_soft_init(softc, arg) *************** *** 249,252 **** --- 250,254 ---- /* with the synchronisation tables. */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_soft_fini(softc, arg) *************** *** 257,262 **** if (softs->syncnattab != NULL) { ! ipf_sync_flush_table(softs, softs->ipf_sync_nat_tab_sz, ! softs->syncnattab); KFREES(softs->syncnattab, softs->ipf_sync_nat_tab_sz * sizeof(*softs->syncnattab)); --- 259,264 ---- if (softs->syncnattab != NULL) { ! (void) ipf_sync_flush_table(softs, softs->ipf_sync_nat_tab_sz, ! softs->syncnattab); KFREES(softs->syncnattab, softs->ipf_sync_nat_tab_sz * sizeof(*softs->syncnattab)); *************** *** 265,270 **** if (softs->syncstatetab != NULL) { ! ipf_sync_flush_table(softs, softs->ipf_sync_state_tab_sz, ! softs->syncstatetab); KFREES(softs->syncstatetab, softs->ipf_sync_state_tab_sz * --- 267,272 ---- if (softs->syncstatetab != NULL) { ! (void) ipf_sync_flush_table(softs, softs->ipf_sync_state_tab_sz, ! softs->syncstatetab); KFREES(softs->syncstatetab, softs->ipf_sync_state_tab_sz * *************** *** 296,299 **** --- 298,302 ---- } + /*ARGSUSED*/ void ipf_sync_soft_destroy(softc, arg) *************** *** 568,572 **** /* no more data */ ! return 0; } --- 571,575 ---- /* no more data */ ! return err; } *************** *** 746,750 **** if (softs->ipf_sync_debug > 4) ! printf("[%d] Filter rules = %p\n", sp->sm_num, fr); is->is_rule = fr; --- 749,753 ---- if (softs->ipf_sync_debug > 4) ! printf("[%d] Filter rule = %p\n", sp->sm_num,(void*)fr); is->is_rule = fr; *************** *** 764,768 **** softs->syncstatetab[hv] = sl; MUTEX_DOWNGRADE(&softs->ipf_syncstate); ! ipf_state_insert(softc, is, sp->sm_rev); /* * Do not initialise the interface pointers for the state --- 767,771 ---- softs->syncstatetab[hv] = sl; MUTEX_DOWNGRADE(&softs->ipf_syncstate); ! (void) ipf_state_insert(softc, is, sp->sm_rev); /* * Do not initialise the interface pointers for the state *************** *** 938,942 **** synclist_t *sl; u_int hv = 0; ! int err; READ_ENTER(&softs->ipf_syncnat); --- 941,945 ---- synclist_t *sl; u_int hv = 0; ! int err = 0; READ_ENTER(&softs->ipf_syncnat); *************** *** 1015,1019 **** RWLOCK_EXIT(&softs->ipf_syncnat); ! return 0; } --- 1018,1022 ---- RWLOCK_EXIT(&softs->ipf_syncnat); ! return err; } *************** *** 1299,1308 **** /* ------------------------------------------------------------------------ */ int ! ipf_sync_ioctl(softc, data, cmd, mode, uid, ctx) ipf_main_softc_t *softc; caddr_t data; ioctlcmd_t cmd; - int mode, uid; - void *ctx; { ipf_sync_softc_t *softs = softc->ipf_sync_soft; --- 1302,1309 ---- /* ------------------------------------------------------------------------ */ int ! ipf_sync_ioctl(softc, data, cmd) ipf_main_softc_t *softc; caddr_t data; ioctlcmd_t cmd; { ipf_sync_softc_t *softs = softc->ipf_sync_soft; *************** *** 1398,1401 **** --- 1399,1403 ---- /* XXX Maybe this should return false if the sync table is full? */ /* ------------------------------------------------------------------------ */ + /*ARGSUSED*/ int ipf_sync_canwrite(arg) Index: ip_fil_solaris.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_fil_solaris.c,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** ip_fil_solaris.c 22 Jul 2012 08:02:22 -0000 1.46 --- ip_fil_solaris.c 13 Aug 2012 11:42:01 -0000 1.47 *************** *** 147,151 **** --- 147,153 ---- ipf_main_softc_t *softc; { + #if SOLARIS2 <= 8 int i; + #endif #ifdef IPFDEBUG *************** *** 243,246 **** --- 245,249 ---- dev, cmd, data, mode, cp, rp); #endif + softc = GET_SOFTC(crgetzoneid(cp)); unit = getminor(dev); if (IPL_LOGMAX < unit) { *************** *** 249,254 **** } - softc = GET_SOFTC(crgetzoneid(cp)); - if (softc->ipf_running <= 0) { if (unit != IPL_LOGIPF && cmd != SIOCIPFINTERROR) { --- 252,255 ---- *************** *** 721,725 **** struct sockaddr_in sin[2]; net_ifaddr_t types[2]; - void *array; int error; --- 722,725 ---- *************** *** 744,748 **** int logical = 0; - array = sin; do { error = net_getlifaddr(softc->ipf_nd_v4, --- 744,747 ---- *************** *** 755,761 **** return error; } else { ! array = sin6; ! net_getlifaddr(softc->ipf_nd_v6, (phy_if_t)qifptr, 0, ! 2, types, sin6); } --- 754,761 ---- return error; } else { ! error = net_getlifaddr(softc->ipf_nd_v6, (phy_if_t)qifptr, 0, ! 2, types, sin6); ! if (error != 0) ! return error; } *************** *** 821,826 **** { ipf_main_softc_t *softc = fin->fin_main_soft; - ipstate_t *is; - nat_t *nat; u_short id; --- 821,824 ---- *************** *** 1135,1138 **** --- 1133,1137 ---- else dst6 = fin->fin_dst6.in6; + dstp = &dst6; } #endif *************** *** 1238,1242 **** { qpktinfo_t *qpi = fin->fin_qpi; ! int out = fin->fin_out, dpoff; char *ip; mb_t *m; --- 1237,1241 ---- { qpktinfo_t *qpi = fin->fin_qpi; ! int dpoff; char *ip; mb_t *m; *************** *** 1330,1334 **** } ! qp->qp_mb = *fin->fin_mp; if (fin->fin_v == 4) qp->qp_sap = 0x800; --- 1329,1336 ---- } ! if (m == fin->fin_m) ! qp->qp_mb = *fin->fin_mp; ! else ! qp->qp_mb = m; if (fin->fin_v == 4) qp->qp_sap = 0x800; *************** *** 1344,1348 **** net_inject_t inject; inject.ni_physical = (phy_if_t)fin->fin_ifp; ! inject.ni_packet = *fin->fin_mp; if (fin->fin_v == 4) { sin = (struct sockaddr_in *)&inject.ni_addr; --- 1346,1353 ---- net_inject_t inject; inject.ni_physical = (phy_if_t)fin->fin_ifp; ! if (m == fin->fin_m) ! inject.ni_packet = *fin->fin_mp; ! else ! inject.ni_packet = m; if (fin->fin_v == 4) { sin = (struct sockaddr_in *)&inject.ni_addr; *************** *** 1357,1361 **** sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! memcpy(&sin6->sin6_addr, &fin->fin_dst6, sizeof(fin->fin_dst6)); if (fin->fin_out == 0) return net_inject(softc->ipf_nd_v6, NI_QUEUE_IN, &inject); --- 1362,1366 ---- sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! (void) memcpy(&sin6->sin6_addr, &fin->fin_dst6, sizeof(fin->fin_dst6)); if (fin->fin_out == 0) return net_inject(softc->ipf_nd_v6, NI_QUEUE_IN, &inject); *************** *** 1365,1368 **** --- 1370,1374 ---- + /*ARGSUSED*/ static int ipf_sendpkt(softc, v, ifp, mb, ip, dstp) *************** *** 1387,1391 **** sin = (struct sockaddr_in *)&inject.ni_addr; sin->sin_family = AF_INET; ! memcpy(&sin->sin_addr, dstp, sizeof(sin->sin_addr)); return net_inject(softc->ipf_nd_v4, NI_DIRECT_OUT, &inject); } --- 1393,1397 ---- sin = (struct sockaddr_in *)&inject.ni_addr; sin->sin_family = AF_INET; ! (void) memcpy(&sin->sin_addr, dstp, sizeof(sin->sin_addr)); return net_inject(softc->ipf_nd_v4, NI_DIRECT_OUT, &inject); } *************** *** 1393,1397 **** sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! memcpy(&sin6->sin6_addr, dstp, sizeof(sin6->sin6_addr)); return net_inject(softc->ipf_nd_v6, NI_DIRECT_OUT, &inject); #endif --- 1399,1403 ---- sin6 = (struct sockaddr_in6 *)&inject.ni_addr; sin6->sin6_family = AF_INET6; ! (void) memcpy(&sin6->sin6_addr, dstp, sizeof(sin6->sin6_addr)); return net_inject(softc->ipf_nd_v6, NI_DIRECT_OUT, &inject); #endif *************** *** 1452,1456 **** ipf_prependmbt(fr_info_t *fin, mblk_t *m) { ! mblk_t *o = NULL, *top; mblk_t *n = *fin->fin_mp; qpktinfo_t *qpi; --- 1458,1462 ---- ipf_prependmbt(fr_info_t *fin, mblk_t *m) { ! mblk_t *o = NULL; mblk_t *n = *fin->fin_mp; qpktinfo_t *qpi; *************** *** 1496,1499 **** --- 1502,1506 ---- + /*ARGSUSED*/ static void * ipf_routeto(fin, v, dstip) *************** *** 1508,1512 **** struct sockaddr *sock; net_handle_t proto; - int result; switch (fin->fin_v) --- 1515,1518 ---- Index: ip_state.c =================================================================== RCS file: /cvsroot/ipfilter/ipfilter/ip_state.c,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** ip_state.c 22 Jul 2012 08:02:22 -0000 1.71 --- ip_state.c 13 Aug 2012 11:42:01 -0000 1.72 *************** *** 143,148 **** #define SINCL(x) ATOMIC_INCL(softs->x) #define SBUMP(x) (softs->x)++ ! #define SBUMPD(x, y) do { (softs->x.y)++; DT(y); } while (0) ! #define SBUMPDX(x, y, z)do { (softs->x.y)++; DT(z); } while (0) #ifdef USE_INET6 --- 143,157 ---- #define SINCL(x) ATOMIC_INCL(softs->x) #define SBUMP(x) (softs->x)++ ! #define SBUMPD(x, y) do { \ ! (softs->x.y)++; \ ! DT(y); \ ! _NOTE(CONSTCOND) \ ! } while (0) ! #define SBUMPDX(x, y, z) \ ! do { \ ! (softs->x.y)++; \ ! DT(z); \ ! _NOTE(CONSTCOND) \ ! } while (0) #ifdef USE_INET6 *************** *** 287,291 **** if (softs->ipf_state_tune != NULL) { ! ipf_tune_array_unlink(softc, softs->ipf_state_tune); KFREES(softs->ipf_state_tune, sizeof(ipf_state_tuneables)); softs->ipf_state_tune = NULL; --- 296,300 ---- if (softs->ipf_state_tune != NULL) { ! (void) ipf_tune_array_unlink(softc, softs->ipf_state_tune); KFREES(softs->ipf_state_tune, sizeof(ipf_state_tuneables)); softs->ipf_state_tune = NULL; *************** *** 422,426 **** while ((is = softs->ipf_state_list) != NULL) ! ipf_state_del(softc, is, ISL_UNLOAD); /* --- 431,435 ---- while ((is = softs->ipf_state_list) != NULL) ! (void) ipf_state_del(softc, is, ISL_UNLOAD); /* *************** *** 558,562 **** !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps, sizeof(st.is_ps))) { ! ipf_state_del(softc, sp, ISL_REMOVE); RWLOCK_EXIT(&softc->ipf_state); return 0; --- 567,571 ---- !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps, sizeof(st.is_ps))) { ! (void) ipf_state_del(softc, sp, ISL_REMOVE); RWLOCK_EXIT(&softc->ipf_state); return 0; *************** *** 785,789 **** error = ipf_state_iter(softc, token, &iter, &obj); WRITE_ENTER(&softc->ipf_tokens); ! ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { --- 794,798 ---- error = ipf_state_iter(softc, token, &iter, &obj); WRITE_ENTER(&softc->ipf_tokens); ! (void) ipf_token_deref(softc, token); RWLOCK_EXIT(&softc->ipf_tokens); } else { *************** *** 911,916 **** ipstate_t *is, *isn; ipstate_save_t ips; - int error, out, i; frentry_t *fr; char *name; --- 920,925 ---- ipstate_t *is, *isn; ipstate_save_t ips; frentry_t *fr; + int error, i; char *name; *************** *** 957,961 **** } bcopy((char *)&ips.ips_fr, (char *)fr, sizeof(*fr)); - out = fr->fr_flags & FR_OUTQUE ? 1 : 0; isn->is_rule = fr; ips.ips_is.is_rule = fr; --- 966,969 ---- *************** *** 1864,1870 **** fr->fr_names[fr->fr_ifnames[out << 1] + 1] == '\0')) { is->is_ifp[out << 1] = fr->fr_ifas[0]; ! strncpy(is->is_ifname[out << 1], ! fr->fr_names + fr->fr_ifnames[0], ! sizeof(fr->fr_ifnames[0])); } else { is->is_ifp[out << 1] = fin->fin_ifp; --- 1872,1878 ---- fr->fr_names[fr->fr_ifnames[out << 1] + 1] == '\0')) { is->is_ifp[out << 1] = fr->fr_ifas[0]; ! (void) strncpy(is->is_ifname[out << 1], ! fr->fr_names + fr->fr_ifnames[0], ! sizeof(fr->fr_ifnames[0])); } else { is->is_ifp[out << 1] = fin->fin_ifp; *************** *** 1875,1895 **** is->is_ifp[(out << 1) + 1] = fr->fr_ifas[1]; if (fr->fr_ifnames[1] != -1) { ! strncpy(is->is_ifname[(out << 1) + 1], ! fr->fr_names + fr->fr_ifnames[1], ! sizeof(fr->fr_ifnames[1])); } is->is_ifp[(1 - out) << 1] = fr->fr_ifas[2]; if (fr->fr_ifnames[2] != -1) { ! strncpy(is->is_ifname[((1 - out) << 1)], ! fr->fr_names + fr->fr_ifnames[2], ! sizeof(fr->fr_ifnames[2])); } is->is_ifp[((1 - out) << 1) + 1] = fr->fr_ifas[3]; if (fr->fr_ifnames[3] != -1) { ! strncpy(is->is_ifname[((1 - out) << 1) + 1], ! fr->fr_names + fr->fr_ifnames[3], ! sizeof(fr->fr_ifnames[3])); } } else { --- 1883,1903 ---- is->is_ifp[(out << 1) + 1] = fr->fr_ifas[1]; if (fr->fr_ifnames[1] != -1) { ! (void) strncpy(is->is_ifname[(out << 1) + 1], ! fr->fr_names + fr->fr_ifnames[1], ! sizeof(fr->fr_ifnames[1])); } is->is_ifp[(1 - out) << 1] = fr->fr_ifas[2]; if (fr->fr_ifnames[2] != -1) { ! (void) strncpy(is->is_ifname[((1 - out) << 1)], ! fr->fr_names + fr->fr_ifnames[2], ! sizeof(fr->fr_ifnames[2])); } is->is_ifp[((1 - out) << 1) + 1] = fr->fr_ifas[3]; if (fr->fr_ifnames[3] != -1) { ! (void) strncpy(is->is_ifname[((1 - out) << 1) + 1], ! fr->fr_names + fr->fr_ifnames[3], ! sizeof(fr->fr_ifnames[3])); } } else { *************** *** 1994,1999 **** fdp = &fr->fr_tifs[0]; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[0]); } else { bcopy(fdp, &is->is_tifs[0], sizeof(*fdp)); --- 2002,2007 ---- fdp = &fr->fr_tifs[0]; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[0]); } else { bcopy(fdp, &is->is_tifs[0], sizeof(*fdp)); *************** *** 2002,2007 **** fdp = &fr->fr_tifs[1]; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_tifs[1], sizeof(*fdp)); --- 2010,2015 ---- fdp = &fr->fr_tifs[1]; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_tifs[1], sizeof(*fdp)); *************** *** 2011,2016 **** fdp = &fr->fr_dif; if (fdp->fd_type == FRD_DSTLIST) { ! ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_dif); } else { bcopy(fdp, &is->is_dif, sizeof(*fdp)); --- 2019,2024 ---- fdp = &fr->fr_dif; if (fdp->fd_type == FRD_DSTLIST) { ! (void) ipf_dstlist_select_node(fin, fdp->fd_ptr, NULL, ! &is->is_tifs[1]); } else { bcopy(fdp, &is->is_dif, sizeof(*fdp)); *************** *** 2405,2413 **** inseq = 1; } else if (!(flags & IS_TCPFSM)) { int i; i = (fin->fin_rev << 1) + fin->fin_out; - #if 0 if (is_pkts[i]0 == 0) { /* --- 2413,2421 ---- inseq = 1; } else if (!(flags & IS_TCPFSM)) { + #if 0 int i; i = (fin->fin_rev << 1) + fin->fin... [truncated message content] |