The initialization style of union, ".<member>=<value>", is one of the latest gcc extention. It's better not to use it.
Signed-off-by: Mitsuru Chinen <[email protected]> --- testcases/network/lib6/asapi_01.c | 132 ++++++++++++------------ testcases/network/lib6/asapi_02.c | 200 ++++++++++++++++++------------------ testcases/network/lib6/asapi_03.c | 122 +++++++++++----------- testcases/network/lib6/asapi_05.c | 58 ++++++------ testcases/network/lib6/asapi_06.c | 31 +++--- testcases/network/lib6/asapi_07.c | 30 +++--- 6 files changed, 288 insertions(+), 285 deletions(-) diff --git a/testcases/network/lib6/asapi_01.c b/testcases/network/lib6/asapi_01.c index 1d7b90c..91e5d64 100644 --- a/testcases/network/lib6/asapi_01.c +++ b/testcases/network/lib6/asapi_01.c @@ -69,151 +69,151 @@ struct ftent { } ftab[] = { /* section 2.1 structure & field definitions */ { "ip6_hdr un1_flow", EXISTS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_flow", "0", .ft_value="4" }, + "ip6_ctlun.ip6_un1.ip6_un1_flow", "0", {"4"} }, { "ip6_hdr ip6_flow", ALIAS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_flow", 0, .ft_dname="ip6_flow" }, + "ip6_ctlun.ip6_un1.ip6_un1_flow", NULL, {"ip6_flow"} }, { "ip6_hdr un1_plen", EXISTS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_plen", "4", .ft_value="2" }, + "ip6_ctlun.ip6_un1.ip6_un1_plen", "4", {"2"} }, { "ip6_hdr ip6_plen", ALIAS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_plen", "4", .ft_dname="ip6_plen" }, + "ip6_ctlun.ip6_un1.ip6_un1_plen", "4", {"ip6_plen"} }, { "ip6_hdr un1_nxt", EXISTS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_nxt", "6", .ft_value="1" }, + "ip6_ctlun.ip6_un1.ip6_un1_nxt", "6", {"1"} }, { "ip6_hdr ip6_nxt", ALIAS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_nxt", 0, .ft_dname="ip6_nxt" }, + "ip6_ctlun.ip6_un1.ip6_un1_nxt", NULL, {"ip6_nxt"} }, { "ip6_hdr un1_hlim", EXISTS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_hlim", "7", .ft_value="1" }, + "ip6_ctlun.ip6_un1.ip6_un1_hlim", "7", {"1"} }, { "ip6_hdr ip6_hlim", ALIAS, IP6_H, "ip6_hdr", - "ip6_ctlun.ip6_un1.ip6_un1_hlim", 0, .ft_dname="ip6_hlim" }, + "ip6_ctlun.ip6_un1.ip6_un1_hlim", NULL, {"ip6_hlim"} }, { "ip6_hdr un1_vfc", EXISTS, IP6_H, "ip6_hdr", "ip6_ctlun.ip6_un2_vfc", "0", - .ft_value="1" }, + {"1"} }, { "ip6_hdr ip6_src", EXISTS, IP6_H, "ip6_hdr", "ip6_src", "sizeof(struct ip6_hdrctl)", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, { "ip6_hdr ip6_dst", EXISTS, IP6_H, "ip6_hdr", "ip6_dst", "(sizeof(struct ip6_hdrctl)+sizeof(struct in6_addr))", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, /* section 2.2 structure and field definitions */ { "IPPROTO_HOPOPTS", VALUE, IN_H, "IPPROTO_HOPOPTS", - 0, 0, .ft_dname="0" }, + NULL, NULL, {"0"} }, { "IPPROTO_IPV6", VALUE, IN_H, "IPPROTO_IPV6", - 0, 0, .ft_dname="41" }, + NULL, NULL, {"41"} }, { "IPPROTO_ROUTING", VALUE, IN_H, "IPPROTO_ROUTING", - 0, 0, .ft_dname="43" }, + NULL, NULL, {"43"} }, { "IPPROTO_FRAGMENT", VALUE, IN_H, "IPPROTO_FRAGMENT", - 0, 0, .ft_dname="44" }, + NULL, NULL, {"44"} }, { "IPPROTO_ESP", VALUE, IN_H, "IPPROTO_ESP", - 0, 0, .ft_dname="50" }, + NULL, NULL, {"50"} }, { "IPPROTO_AH", VALUE, IN_H, "IPPROTO_AH", - 0, 0, .ft_dname="51" }, + NULL, NULL, {"51"} }, { "IPPROTO_ICMPV6", VALUE, IN_H, "IPPROTO_ICMPV6", - 0, 0, .ft_dname="58" }, + NULL, NULL, {"58"} }, { "IPPROTO_NONE", VALUE, IN_H, "IPPROTO_NONE", - 0, 0, .ft_dname="59" }, + NULL, NULL, {"59"} }, { "IPPROTO_DSTOPTS", VALUE, IN_H, "IPPROTO_DSTOPTS", - 0, 0, .ft_dname="60" }, + NULL, NULL, {"60"} }, /* ip6_hbh */ { "ip6_hbh ip6h_nxt", EXISTS, IP6_H, "ip6_hbh", - "ip6h_nxt", "0", .ft_value="1" }, + "ip6h_nxt", "0", {"1"} }, { "ip6_hbh ip6h_nxt", EXISTS, IP6_H, "ip6_hbh", - "ip6h_len", "1", .ft_value="1" }, + "ip6h_len", "1", {"1"} }, /* ip6_dest */ { "ip6_dest ip6d_nxt", EXISTS, IP6_H, "ip6_dest", - "ip6d_nxt", "0", .ft_value="1" }, + "ip6d_nxt", "0", {"1"} }, { "ip6_dest ip6d_nxt", EXISTS, IP6_H, "ip6_dest", - "ip6d_len", "1", .ft_value="1" }, + "ip6d_len", "1", {"1"} }, /* ip6_rthdr0 */ { "ip6_rthdr0 ip6r0_nxt", EXISTS, IP6_H, "ip6_rthdr0", - "ip6r0_nxt", "0", .ft_value="1" }, + "ip6r0_nxt", "0", {"1"} }, { "ip6_rthdr0 ip6r0_len", EXISTS, IP6_H, "ip6_rthdr0", - "ip6r0_len", "1", .ft_value="1" }, + "ip6r0_len", "1", {"1"} }, { "ip6_rthdr0 ip6r0_type", EXISTS, IP6_H, "ip6_rthdr0", - "ip6r0_type", "2", .ft_value="1" }, + "ip6r0_type", "2", {"1"} }, { "ip6_rthdr0 ip6r0_segleft", EXISTS, IP6_H, "ip6_rthdr0", - "ip6r0_segleft", "3", .ft_value="1" }, + "ip6r0_segleft", "3", {"1"} }, { "ip6_rthdr0 ip6r0_reserved", EXISTS, IP6_H, "ip6_rthdr0", - "ip6r0_reserved", "4", .ft_value="1" }, + "ip6r0_reserved", "4", {"1"} }, /* ip6_frag */ { "ip6_frag ip6f_nxt", EXISTS, IP6_H, "ip6_frag", - "ip6f_nxt", "0", .ft_value="1" }, + "ip6f_nxt", "0", {"1"} }, { "ip6_frag ip6f_reserved", EXISTS, IP6_H, "ip6_frag", - "ip6f_reserved", "1", .ft_value="1" }, + "ip6f_reserved", "1", {"1"} }, { "ip6_frag ip6f_offlg", EXISTS, IP6_H, "ip6_frag", - "ip6f_offlg", "2", .ft_value="2" }, + "ip6f_offlg", "2", {"2"} }, { "ip6_frag ip6f_ident", EXISTS, IP6_H, "ip6_frag", - "ip6f_ident", "4", .ft_value="4" }, + "ip6f_ident", "4", {"4"} }, { "IP6F_OFF_MASK", VALUE, IP6_H, "IP6F_OFF_MASK", - 0, .ft_dname="htons(0xfff8)" }, + NULL, NULL, {"htons(0xfff8)"} }, { "IP6F_RESERVED_MASK", VALUE, IP6_H, "IP6F_RESERVED_MASK", - 0, .ft_dname="htons(0x0006)" }, + NULL, NULL, {"htons(0x0006)"} }, { "IP6F_MORE_FRAG", VALUE, IP6_H, "IP6F_MORE_FRAG", - 0, .ft_dname="htons(0x0001)" }, + NULL, NULL, {"htons(0x0001)"} }, { "IP6OPT_TYPE", VALUE, IP6_H, "IP6OPT_TYPE(0xff)", - 0, .ft_dname="0xc0" }, + NULL, NULL, {"0xc0"} }, { "IP6OPT_TYPE_SKIP", VALUE, IP6_H, "IP6OPT_TYPE_SKIP", - 0, .ft_dname="0x00" }, + NULL, NULL, {"0x00"} }, { "IP6OPT_TYPE_DISCARD", VALUE, IP6_H, "IP6OPT_TYPE_DISCARD", - 0, .ft_dname="0x40" }, + NULL, NULL, {"0x40"} }, { "IP6OPT_TYPE_FORCEICMP", VALUE, IP6_H, "IP6OPT_TYPE_FORCEICMP", - 0, .ft_dname="0x80" }, + NULL, NULL, {"0x80"} }, { "IP6OPT_TYPE_ICMP", VALUE, IP6_H, "IP6OPT_TYPE_ICMP", - 0, .ft_dname="0xc0" }, + NULL, NULL, {"0xc0"} }, { "IP6OPT_TYPE_MUTABLE", VALUE, IP6_H, "IP6OPT_TYPE_MUTABLE", - 0, .ft_dname="0x20" }, + NULL, NULL, {"0x20"} }, { "IP6OPT_PAD1", VALUE, IP6_H, "IP6OPT_PAD1", - 0, .ft_dname="0x00" }, + NULL, NULL, {"0x00"} }, { "IP6OPT_PADN", VALUE, IP6_H, "IP6OPT_PADN", - 0, .ft_dname="0x01" }, + NULL, NULL, {"0x01"} }, { "IP6OPT_JUMBO", VALUE, IP6_H, "IP6OPT_JUMBO", - 0, .ft_dname="0xc2" }, + NULL, NULL, {"0xc2"} }, { "IP6OPT_NSAP_ADDR", VALUE, IP6_H, "IP6OPT_NSAP_ADDR", - 0, .ft_dname="0xc3" }, + NULL, NULL, {"0xc3"} }, { "IP6OPT_TUNNEL_LIMIT", VALUE, IP6_H, "IP6OPT_TUNNEL_LIMIT", - 0, .ft_dname="0x04" }, + NULL, NULL, {"0x04"} }, { "IP6OPT_ROUTER_ALERT", VALUE, IP6_H, "IP6OPT_ROUTER_ALERT", - 0, .ft_dname="0x05" }, + NULL, NULL, {"0x05"} }, /* ip6_opt_jumbo */ { "ip6_opt_jumbo ip6oj_type", EXISTS, IP6_H, "ip6_opt_jumbo", - "ip6oj_type", "0", .ft_value="1" }, + "ip6oj_type", "0", {"1"} }, { "ip6_opt_jumbo ip6oj_len", EXISTS, IP6_H, "ip6_opt_jumbo", - "ip6oj_len", "1", .ft_value="1" }, + "ip6oj_len", "1", {"1"} }, { "ip6_opt_jumbo ip6oj_jumbo_len element", EXISTS, IP6_H, - "ip6_opt_jumbo", "ip6oj_jumbo_len[0]", "2", .ft_value="1" }, + "ip6_opt_jumbo", "ip6oj_jumbo_len[0]", "2", {"1"} }, { "ip6_opt_jumbo ip6oj_jumbo_len array", EXISTS, IP6_H, - "ip6_opt_jumbo", "ip6oj_jumbo_len", "2", .ft_value="4" }, + "ip6_opt_jumbo", "ip6oj_jumbo_len", "2", {"4"} }, /* ip6_opt_nsap */ { "ip6_opt_nsap ip6on_type", EXISTS, IP6_H, "ip6_opt_nsap", - "ip6on_type", "0", .ft_value="1" }, + "ip6on_type", "0", {"1"} }, { "ip6_opt_nsap ip6on_len", EXISTS, IP6_H, "ip6_opt_nsap", - "ip6on_len", "1", .ft_value="1" }, + "ip6on_len", "1", {"1"} }, { "ip6_opt_nsap ip6on_src_nsap_len", EXISTS, IP6_H, "ip6_opt_nsap", - "ip6on_src_nsap_len", "2", .ft_value="1" }, + "ip6on_src_nsap_len", "2", {"1"} }, { "ip6_opt_nsap ip6on_dst_nsap_len", EXISTS, IP6_H, "ip6_opt_nsap", - "ip6on_dst_nsap_len", "3", .ft_value="1" }, + "ip6on_dst_nsap_len", "3", {"1"} }, /* ip6_opt_tunnel */ { "ip6_opt_tunnel ip6ot_type", EXISTS, IP6_H, "ip6_opt_tunnel", - "ip6ot_type", "0", .ft_value="1" }, + "ip6ot_type", "0", {"1"} }, { "ip6_opt_tunnel ip6ot_len", EXISTS, IP6_H, "ip6_opt_tunnel", - "ip6ot_len", "1", .ft_value="1" }, + "ip6ot_len", "1", {"1"} }, { "ip6_opt_tunnel ip6ot_encap_limit", EXISTS, IP6_H, "ip6_opt_tunnel", - "ip6ot_encap_limit", "2", .ft_value="1" }, + "ip6ot_encap_limit", "2", {"1"} }, /* ip6_opt_router */ { "ip6_opt_router ip6or_type", EXISTS, IP6_H, "ip6_opt_router", - "ip6or_type", "0", .ft_value="1" }, + "ip6or_type", "0", {"1"} }, { "ip6_opt_router ip6or_len", EXISTS, IP6_H, "ip6_opt_router", - "ip6or_len", "1", .ft_value="1" }, + "ip6or_len", "1", {"1"} }, { "ip6_opt_router ip6or_value element", EXISTS, IP6_H, - "ip6_opt_router", "ip6or_value[0]", "2", .ft_value="1" }, + "ip6_opt_router", "ip6or_value[0]", "2", {"1"} }, { "ip6_opt_router ip6or_value array", EXISTS, IP6_H, "ip6_opt_router", - "ip6or_value", "2", .ft_value="2" }, + "ip6or_value", "2", {"2"} }, /* IP6_ALERT_* definitions */ { "IP6_ALERT_MLD", VALUE, IP6_H, "IP6_ALERT_MLD", - 0, 0, .ft_dname="0" }, + NULL, NULL, {"0"} }, { "IP6_ALERT_RSVP", VALUE, IP6_H, "IP6_ALERT_RSVP", - 0, 0, .ft_dname="htons(1)" }, + NULL, NULL, {"htons(1)"} }, { "IP6_ALERT_AN", VALUE, IP6_H, "IP6_ALERT_AN", - 0, 0, .ft_dname="htons(2)" }, + NULL, NULL, {"htons(2)"} }, }; #define FTCOUNT (sizeof(ftab)/sizeof(ftab[0])) diff --git a/testcases/network/lib6/asapi_02.c b/testcases/network/lib6/asapi_02.c index f322910..13a46f3 100644 --- a/testcases/network/lib6/asapi_02.c +++ b/testcases/network/lib6/asapi_02.c @@ -69,253 +69,253 @@ struct ftent { } ftab[] = { /* Section 2.2, icmp6_hdr & defines */ { "icmp6_hdr icmp6_type", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_type", "0", .ft_value="1" }, + "icmp6_type", "0", {"1"} }, { "icmp6_hdr icmp6_code", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_code", "1", .ft_value="1" }, + "icmp6_code", "1", {"1"} }, { "icmp6_hdr icmp6_cksum", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_cksum", "2", .ft_value="2" }, + "icmp6_cksum", "2", {"2"} }, { "icmp6_hdr icmp6_un_data32 element", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data32[0]", "4", .ft_value="4" }, + "icmp6_dataun.icmp6_un_data32[0]", "4", {"4"} }, { "icmp6_hdr icmp6_un_data32 array", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data32", "4", .ft_value="4" }, + "icmp6_dataun.icmp6_un_data32", "4", {"4"} }, { "icmp6_hdr icmp6_un_data16 element", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data16[0]", "4", .ft_value="2" }, + "icmp6_dataun.icmp6_un_data16[0]", "4", {"2"} }, { "icmp6_hdr icmp6_un_data16 array", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data16", "4", .ft_value="4" }, + "icmp6_dataun.icmp6_un_data16", "4", {"4"} }, { "icmp6_hdr icmp6_un_data8 element", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data8[0]", "4", .ft_value="1" }, + "icmp6_dataun.icmp6_un_data8[0]", "4", {"1"} }, { "icmp6_hdr icmp6_un_data8 array", EXISTS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data8", "4", .ft_value="4" }, + "icmp6_dataun.icmp6_un_data8", "4", {"4"} }, /* icmp6_hdr definitions */ { "icmp6_hdr icmp6_data32 define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data32", 0, .ft_dname="icmp6_data32" }, + "icmp6_dataun.icmp6_un_data32", NULL, {"icmp6_data32"} }, { "icmp6_hdr icmp6_data16 define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data16", 0, .ft_dname="icmp6_data16" }, + "icmp6_dataun.icmp6_un_data16", NULL, {"icmp6_data16"} }, { "icmp6_hdr icmp6_data8 define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data8", 0, .ft_dname="icmp6_data8" }, + "icmp6_dataun.icmp6_un_data8", NULL, {"icmp6_data8"} }, { "icmp6_hdr icmp6_pptr define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data32[0]", 0, .ft_dname="icmp6_pptr" }, + "icmp6_dataun.icmp6_un_data32[0]", NULL, {"icmp6_pptr"} }, { "icmp6_hdr icmp6_mtu define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data32[0]", 0, .ft_dname="icmp6_mtu" }, + "icmp6_dataun.icmp6_un_data32[0]", NULL, {"icmp6_mtu"} }, { "icmp6_hdr icmp6_id define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data16[0]", 0, .ft_dname="icmp6_id" }, + "icmp6_dataun.icmp6_un_data16[0]", NULL, {"icmp6_id"} }, { "icmp6_hdr icmp6_seq define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data16[1]", 0, .ft_dname="icmp6_seq" }, + "icmp6_dataun.icmp6_un_data16[1]", NULL, {"icmp6_seq"} }, { "icmp6_hdr icmp6_maxdelay define", ALIAS, ICMP6_H, "icmp6_hdr", - "icmp6_dataun.icmp6_un_data16[0]", 0, - .ft_dname="icmp6_maxdelay" }, + "icmp6_dataun.icmp6_un_data16[0]", NULL, + {"icmp6_maxdelay"} }, /* Section 2.2.1 ICMPv6 Type and Code Values */ { "ICMP6_DST_UNREACH", VALUE, ICMP6_H, "ICMP6_DST_UNREACH", - 0, 0, .ft_dname="1" }, + NULL, NULL, {"1"} }, { "ICMP6_PACKET_TOO_BIG", VALUE,ICMP6_H, "ICMP6_PACKET_TOO_BIG", - 0, 0, .ft_dname="2" }, + NULL, NULL, {"2"} }, { "ICMP6_TIME_EXCEEDED", VALUE, ICMP6_H, "ICMP6_TIME_EXCEEDED", - 0, 0, .ft_dname="3" }, + NULL, NULL, {"3"} }, { "ICMP6_PARAM_PROB", VALUE, ICMP6_H, "ICMP6_PARAM_PROB", - 0, 0, .ft_dname="4" }, + NULL, NULL, {"4"} }, { "ICMP6_INFOMSG_MASK", VALUE, ICMP6_H, "ICMP6_INFOMSG_MASK", - 0, 0, .ft_dname="0x80" }, + NULL, NULL, {"0x80"} }, { "ICMP6_ECHO_REQUEST", VALUE, ICMP6_H, "ICMP6_ECHO_REQUEST", - 0, 0, .ft_dname="128" }, + NULL, NULL, {"128"} }, { "ICMP6_ECHO_REPLY", VALUE, ICMP6_H, "ICMP6_ECHO_REPLY", - 0, 0, .ft_dname="129" }, + NULL, NULL, {"129"} }, { "ICMP6_DST_UNREACH_NOROUTE", VALUE, ICMP6_H, - "ICMP6_DST_UNREACH_NOROUTE", 0, 0, .ft_dname="0" }, + "ICMP6_DST_UNREACH_NOROUTE", NULL, NULL, {"0"} }, { "ICMP6_DST_UNREACH_ADMIN", VALUE, ICMP6_H, - "ICMP6_DST_UNREACH_ADMIN", 0, 0, .ft_dname="1" }, + "ICMP6_DST_UNREACH_ADMIN", NULL, NULL, {"1"} }, { "ICMP6_DST_UNREACH_BEYONDSCOPE", VALUE, ICMP6_H, - "ICMP6_DST_UNREACH_BEYONDSCOPE", 0, 0, .ft_dname="2" }, + "ICMP6_DST_UNREACH_BEYONDSCOPE", NULL, NULL, {"2"} }, { "ICMP6_DST_UNREACH_ADDR", VALUE, ICMP6_H, - "ICMP6_DST_UNREACH_ADDR", 0, 0, .ft_dname="3" }, + "ICMP6_DST_UNREACH_ADDR", NULL, NULL, {"3"} }, { "ICMP6_DST_UNREACH_NOPORT", VALUE, ICMP6_H, - "ICMP6_DST_UNREACH_NOPORT", 0, 0, .ft_dname="4" }, + "ICMP6_DST_UNREACH_NOPORT", NULL, NULL, {"4"} }, { "ICMP6_TIME_EXCEED_TRANSIT", VALUE, ICMP6_H, - "ICMP6_TIME_EXCEED_TRANSIT", 0, 0, .ft_dname="0" }, + "ICMP6_TIME_EXCEED_TRANSIT", NULL, NULL, {"0"} }, { "ICMP6_TIME_EXCEED_REASSEMBLY", VALUE, ICMP6_H, - "ICMP6_TIME_EXCEED_REASSEMBLY", 0, 0, .ft_dname="1" }, + "ICMP6_TIME_EXCEED_REASSEMBLY", NULL, NULL, {"1"} }, { "ICMP6_PARAMPROB_HEADER", VALUE, ICMP6_H, - "ICMP6_PARAMPROB_HEADER", 0, 0, .ft_dname="0" }, + "ICMP6_PARAMPROB_HEADER", NULL, NULL, {"0"} }, { "ICMP6_PARAMPROB_NEXTHEADER", VALUE, ICMP6_H, - "ICMP6_PARAMPROB_NEXTHEADER", 0, 0, .ft_dname="1" }, + "ICMP6_PARAMPROB_NEXTHEADER", NULL, NULL, {"1"} }, { "ICMP6_PARAMPROB_OPTION", VALUE, ICMP6_H, - "ICMP6_PARAMPROB_OPTION", 0, 0, .ft_dname="2" }, + "ICMP6_PARAMPROB_OPTION", NULL, NULL, {"2"} }, /* section 2.2.2, Neighbor Discovery */ { "ND_ROUTER_SOLICIT", VALUE, ICMP6_H, "ND_ROUTER_SOLICIT", - 0, 0, .ft_dname="133" }, + NULL, NULL, {"133"} }, { "ND_ROUTER_ADVERT", VALUE, ICMP6_H, "ND_ROUTER_ADVERT", - 0, 0, .ft_dname="134" }, + NULL, NULL, {"134"} }, { "ND_NEIGHBOR_SOLICIT", VALUE, ICMP6_H, "ND_NEIGHBOR_SOLICIT", - 0, 0, .ft_dname="135" }, + NULL, NULL, {"135"} }, { "ND_NEIGHBOR_ADVERT", VALUE, ICMP6_H, "ND_NEIGHBOR_ADVERT", - 0, 0, .ft_dname="136" }, + NULL, NULL, {"136"} }, { "ND_REDIRECT", VALUE, ICMP6_H, "ND_REDIRECT", - 0, 0, .ft_dname="137" }, + NULL, NULL, {"137"} }, { "nd_router_solicit nd_rs_hdr", EXISTS, ICMP6_H, "nd_router_solicit", - "nd_rs_hdr", "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "nd_rs_hdr", "0", {"sizeof(struct icmp6_hdr)"} }, { "nd_router_solicit nd_rs_type define", ALIAS, ICMP6_H, "nd_router_solicit", "nd_rs_hdr.icmp6_type", - 0, .ft_dname="nd_rs_type" }, + NULL, {"nd_rs_type"} }, { "nd_router_solicit nd_rs_code define", ALIAS, ICMP6_H, "nd_router_solicit", "nd_rs_hdr.icmp6_code", - 0, .ft_dname="nd_rs_code" }, + NULL, {"nd_rs_code"} }, { "nd_router_solicit nd_rs_cksum define", ALIAS, ICMP6_H, "nd_router_solicit", "nd_rs_hdr.icmp6_cksum", - 0, .ft_dname="nd_rs_cksum" }, + NULL, {"nd_rs_cksum"} }, { "nd_router_solicit nd_rs_reserved define", ALIAS, ICMP6_H, "nd_router_solicit", "nd_rs_hdr.icmp6_data32[0]", - 0, .ft_dname="nd_rs_reserved" }, + NULL, {"nd_rs_reserved"} }, { "nd_router_advert nd_ra_hdr", EXISTS, ICMP6_H, "nd_router_advert", - "nd_ra_hdr", "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "nd_ra_hdr", "0", {"sizeof(struct icmp6_hdr)"} }, { "nd_router_advert nd_ra_reachable", EXISTS, ICMP6_H, "nd_router_advert", "nd_ra_reachable", - "sizeof(struct icmp6_hdr)", .ft_value="4" }, + "sizeof(struct icmp6_hdr)", {"4"} }, { "nd_router_advert nd_ra_retransmit", EXISTS, ICMP6_H, "nd_router_advert", "nd_ra_retransmit", - "sizeof(struct icmp6_hdr)+4", .ft_value="4" }, + "sizeof(struct icmp6_hdr)+4", {"4"} }, { "nd_router_advert nd_ra_type define", ALIAS, ICMP6_H, "nd_router_advert", "nd_ra_hdr.icmp6_type", - 0, .ft_dname="nd_ra_type" }, + NULL, {"nd_ra_type"} }, { "nd_router_advert nd_ra_code define", ALIAS, ICMP6_H, "nd_router_advert", "nd_ra_hdr.icmp6_code", - 0, .ft_dname="nd_ra_code" }, + NULL, {"nd_ra_code"} }, { "nd_router_advert nd_ra_cksum define", ALIAS, ICMP6_H, "nd_router_advert", "nd_ra_hdr.icmp6_cksum", - 0, .ft_dname="nd_ra_cksum" }, + NULL, {"nd_ra_cksum"} }, { "nd_router_advert nd_ra_curhoplimit define", ALIAS, ICMP6_H, "nd_router_advert", "nd_ra_hdr.icmp6_data8[0]", - 0, .ft_dname="nd_ra_curhoplimit" }, + NULL, {"nd_ra_curhoplimit"} }, { "nd_router_advert nd_ra_flags_reserved define", ALIAS, ICMP6_H, "nd_router_advert", "nd_ra_hdr.icmp6_data8[1]", - 0, .ft_dname="nd_ra_flags_reserved" }, + NULL, {"nd_ra_flags_reserved"} }, { "ND_RA_FLAG_MANAGED", VALUE, ICMP6_H, "ND_RA_FLAG_MANAGED", - 0, 0, .ft_dname="0x80" }, + NULL, NULL, {"0x80"} }, { "ND_RA_FLAG_OTHER", VALUE, ICMP6_H, "ND_RA_FLAG_OTHER", - 0, 0, .ft_dname="0x40" }, + NULL, NULL, {"0x40"} }, { "nd_router_advert nd_ra_router_lifetime define", ALIAS, ICMP6_H, "nd_router_advert", "nd_ra_hdr.icmp6_data16[1]", - 0, .ft_dname="nd_ra_router_lifetime" }, + NULL, {"nd_ra_router_lifetime"} }, { "nd_neighbor_solicit nd_ns_hdr", EXISTS, ICMP6_H, "nd_neighbor_solicit", "nd_ns_hdr", - "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "0", {"sizeof(struct icmp6_hdr)"} }, { "nd_neighbor_solicit nd_ns_target", EXISTS, ICMP6_H, "nd_neighbor_solicit", "nd_ns_target", "sizeof(struct icmp6_hdr)", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, { "nd_neighbor_solicit nd_ns_type define", ALIAS, ICMP6_H, "nd_neighbor_solicit", "nd_ns_hdr.icmp6_type", - 0, .ft_dname="nd_ns_type" }, + NULL, {"nd_ns_type"} }, { "nd_neighbor_solicit nd_ns_code define", ALIAS, ICMP6_H, "nd_neighbor_solicit", "nd_ns_hdr.icmp6_code", - 0, .ft_dname="nd_ns_code" }, + NULL, {"nd_ns_code"} }, { "nd_neighbor_solicit nd_ns_cksum define", ALIAS, ICMP6_H, "nd_neighbor_solicit", "nd_ns_hdr.icmp6_cksum", - 0, .ft_dname="nd_ns_cksum" }, + NULL, {"nd_ns_cksum"} }, { "nd_neighbor_solicit nd_ns_reserved define", ALIAS, ICMP6_H, "nd_neighbor_solicit", "nd_ns_hdr.icmp6_data32[0]", - 0, .ft_dname="nd_ns_reserved" }, + NULL, {"nd_ns_reserved"} }, { "nd_neighbor_advert nd_na_hdr", EXISTS, ICMP6_H, "nd_neighbor_advert", "nd_na_hdr", - "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "0", {"sizeof(struct icmp6_hdr)"} }, { "nd_neighbor_advert nd_na_target", EXISTS, ICMP6_H, "nd_neighbor_advert", "nd_na_target", "sizeof(struct icmp6_hdr)", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, { "nd_neighbor_advert nd_na_type define", ALIAS, ICMP6_H, "nd_neighbor_advert", "nd_na_hdr.icmp6_type", - 0, .ft_dname="nd_na_type" }, + NULL, {"nd_na_type"} }, { "nd_neighbor_advert nd_na_code define", ALIAS, ICMP6_H, "nd_neighbor_advert", "nd_na_hdr.icmp6_code", - 0, .ft_dname="nd_na_code" }, + NULL, {"nd_na_code"} }, { "nd_neighbor_advert nd_na_cksum define", ALIAS, ICMP6_H, "nd_neighbor_advert", "nd_na_hdr.icmp6_cksum", - 0, .ft_dname="nd_na_cksum" }, + NULL, {"nd_na_cksum"} }, { "nd_neighbor_advert nd_na_flags_reserved define", ALIAS, ICMP6_H, "nd_neighbor_advert", "nd_na_hdr.icmp6_data32[0]", - 0, .ft_dname="nd_na_flags_reserved" }, + NULL, {"nd_na_flags_reserved"} }, { "ND_NA_FLAG_ROUTER", VALUE, ICMP6_H, "ND_NA_FLAG_ROUTER", - 0, 0, .ft_dname="htonl(0x80000000)" }, + NULL, NULL, {"htonl(0x80000000)"} }, { "ND_NA_FLAG_SOLICITED", VALUE, ICMP6_H, "ND_NA_FLAG_SOLICITED", - 0, 0, .ft_dname="htonl(0x40000000)" }, + NULL, NULL, {"htonl(0x40000000)"} }, { "ND_NA_FLAG_OVERRIDE", VALUE, ICMP6_H, "ND_NA_FLAG_OVERRIDE", - 0, 0, .ft_dname="htonl(0x20000000)" }, + NULL, NULL, {"htonl(0x20000000)"} }, { "nd_redirect nd_rd_hdr", EXISTS, ICMP6_H, "nd_redirect", "nd_rd_hdr", - "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "0", {"sizeof(struct icmp6_hdr)"} }, { "nd_redirect nd_rd_target", EXISTS, ICMP6_H, "nd_redirect", "nd_rd_target", "sizeof(struct icmp6_hdr)", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, { "nd_redirect nd_rd_dst", EXISTS, ICMP6_H, "nd_redirect", "nd_rd_dst", "sizeof(struct icmp6_hdr)+sizeof(struct in6_addr)", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, { "nd_redirect nd_rd_type define", ALIAS, ICMP6_H, "nd_neighbor_advert", "nd_na_hdr.icmp6_data32[0]", - 0, .ft_dname="nd_na_flags_reserved" }, + NULL, {"nd_na_flags_reserved"} }, { "nd_opt_hdr nd_rd_hdr", EXISTS, ICMP6_H, "nd_opt_hdr", "nd_opt_type", - "0", .ft_value="1" }, + "0", {"1"} }, { "nd_opt_hdr nd_rd_hdr", EXISTS, ICMP6_H, "nd_opt_hdr", "nd_opt_len", - "1", .ft_value="1" }, + "1", {"1"} }, { "ND_OPT_SOURCE_LINKADDR", VALUE, ICMP6_H, "ND_OPT_SOURCE_LINKADDR", - 0, 0, .ft_dname="1" }, + NULL, NULL, {"1"} }, { "ND_OPT_TARGET_LINKADDR", VALUE, ICMP6_H, "ND_OPT_TARGET_LINKADDR", - 0, 0, .ft_dname="2" }, + NULL, NULL, {"2"} }, { "ND_OPT_PREFIX_INFORMATION", VALUE, ICMP6_H, - "ND_OPT_PREFIX_INFORMATION", 0, 0, .ft_dname="3" }, + "ND_OPT_PREFIX_INFORMATION", NULL, NULL, {"3"} }, { "ND_OPT_REDIRECTED_HEADER", VALUE, ICMP6_H, - "ND_OPT_REDIRECTED_HEADER", 0, 0, .ft_dname="4" }, - { "ND_OPT_MTU", VALUE, ICMP6_H, "ND_OPT_MTU", 0, 0, .ft_dname="5" }, + "ND_OPT_REDIRECTED_HEADER", NULL, NULL, {"4"} }, + { "ND_OPT_MTU", VALUE, ICMP6_H, "ND_OPT_MTU", NULL, NULL, {"5"} }, { "nd_opt_prefix_info nd_opt_pi_type", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_type", - "0", .ft_value="1" }, + "0", {"1"} }, { "nd_opt_prefix_info nd_opt_pi_len", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_len", - "1", .ft_value="1" }, + "1", {"1"} }, { "nd_opt_prefix_info nd_opt_pi_prefix_len", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_prefix_len", - "2", .ft_value="1" }, + "2", {"1"} }, { "nd_opt_prefix_info nd_opt_pi_flags_reserved", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_flags_reserved", - "3", .ft_value="1" }, + "3", {"1"} }, { "nd_opt_prefix_info nd_opt_pi_valid_time", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_valid_time", - "4", .ft_value="4" }, + "4", {"4"} }, { "nd_opt_prefix_info nd_opt_pi_preferred_time", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_preferred_time", - "8", .ft_value="4" }, + "8", {"4"} }, { "nd_opt_prefix_info nd_opt_pi_reserved2", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_reserved2", - "12", .ft_value="4" }, + "12", {"4"} }, { "nd_opt_prefix_info nd_opt_pi_prefix", EXISTS, ICMP6_H, "nd_opt_prefix_info", "nd_opt_pi_prefix", - "16", .ft_value="sizeof(struct in6_addr)" }, + "16", {"sizeof(struct in6_addr)"} }, { "ND_OPT_PI_FLAG_ONLINK", VALUE, ICMP6_H, "ND_OPT_PI_FLAG_ONLINK", - 0, 0, .ft_dname="0x80" }, + NULL, NULL, {"0x80"} }, { "ND_OPT_PI_FLAG_AUTO", VALUE, ICMP6_H, "ND_OPT_PI_FLAG_AUTO", - 0, 0, .ft_dname="0x40" }, + NULL, NULL, {"0x40"} }, { "nd_opt_rd_hdr nd_opt_rh_type", EXISTS, ICMP6_H, "nd_opt_rd_hdr", - "nd_opt_rh_type", "0", .ft_value="1" }, + "nd_opt_rh_type", "0", {"1"} }, { "nd_opt_rd_hdr nd_opt_rh_len", EXISTS, ICMP6_H, "nd_opt_rd_hdr", - "nd_opt_rh_len", "1", .ft_value="1" }, + "nd_opt_rh_len", "1", {"1"} }, { "nd_opt_rd_hdr nd_opt_rh_reserved1", EXISTS, ICMP6_H, "nd_opt_rd_hdr", - "nd_opt_rh_reserved1", "2", .ft_value="2" }, + "nd_opt_rh_reserved1", "2", {"2"} }, { "nd_opt_rd_hdr nd_opt_rh_reserved2", EXISTS, ICMP6_H, "nd_opt_rd_hdr", - "nd_opt_rh_reserved2", "4", .ft_value="4" }, + "nd_opt_rh_reserved2", "4", {"4"} }, { "nd_opt_mtu nd_opt_mtu_type", EXISTS, ICMP6_H, "nd_opt_mtu", - "nd_opt_mtu_type", "0", .ft_value="1" }, + "nd_opt_mtu_type", "0", {"1"} }, { "nd_opt_mtu nd_opt_mtu_len", EXISTS, ICMP6_H, "nd_opt_mtu", - "nd_opt_mtu_len", "1", .ft_value="1" }, + "nd_opt_mtu_len", "1", {"1"} }, { "nd_opt_mtu nd_opt_mtu_reserved", EXISTS, ICMP6_H, "nd_opt_mtu", - "nd_opt_mtu_reserved", "2", .ft_value="2" }, + "nd_opt_mtu_reserved", "2", {"2"} }, { "nd_opt_mtu nd_opt_mtu_mtu", EXISTS, ICMP6_H, "nd_opt_mtu", - "nd_opt_mtu_mtu", "4", .ft_value="4" }, + "nd_opt_mtu_mtu", "4", {"4"} }, }; #define FTCOUNT (sizeof(ftab)/sizeof(ftab[0])) diff --git a/testcases/network/lib6/asapi_03.c b/testcases/network/lib6/asapi_03.c index 1fd98d2..5b0a9db 100644 --- a/testcases/network/lib6/asapi_03.c +++ b/testcases/network/lib6/asapi_03.c @@ -69,132 +69,132 @@ struct ftent { } ftab[] = { /* section 2.2.3, MLDv1 */ { "MLD_LISTENER_QUERY", VALUE, ICMP6_H, "MLD_LISTENER_QUERY", - 0, 0, .ft_dname="130" }, + NULL, NULL, {"130"} }, { "MLD_LISTENER_REPORT", VALUE, ICMP6_H, "MLD_LISTENER_REPORT", - 0, 0, .ft_dname="131" }, + NULL, NULL, {"131"} }, { "MLD_LISTENER_REDUCTION", VALUE, ICMP6_H, "MLD_LISTENER_REDUCTION", - 0, 0, .ft_dname="132" }, + NULL, NULL, {"132"} }, { "mld_hdr mld_icmp6_hdr", EXISTS, ICMP6_H, "mld_hdr", - "mld_icmp6_hdr", "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "mld_icmp6_hdr", "0", {"sizeof(struct icmp6_hdr)"} }, { "mld_hdr mld_addr", EXISTS, ICMP6_H, "mld_hdr", "mld_addr", "sizeof(struct icmp6_hdr)", - .ft_value="sizeof(struct in6_addr)" }, + {"sizeof(struct in6_addr)"} }, { "mld_hdr mld_type define", ALIAS, ICMP6_H, "mld_hdr", - "mld_icmp6_hdr.icmp6_type", 0, .ft_dname="mld_type" }, + "mld_icmp6_hdr.icmp6_type", NULL, {"mld_type"} }, { "mld_hdr mld_code define", ALIAS, ICMP6_H, "mld_hdr", - "mld_icmp6_hdr.icmp6_code", 0, .ft_dname="mld_code" }, + "mld_icmp6_hdr.icmp6_code", NULL, {"mld_code"} }, { "mld_hdr mld_cksum define", ALIAS, ICMP6_H, "mld_hdr", - "mld_icmp6_hdr.icmp6_cksum", 0, .ft_dname="mld_cksum" }, + "mld_icmp6_hdr.icmp6_cksum", NULL, {"mld_cksum"} }, { "mld_hdr mld_maxdelay define", ALIAS, ICMP6_H, "mld_hdr", - "mld_icmp6_hdr.icmp6_data16[0]", 0, .ft_dname="mld_maxdelay" }, + "mld_icmp6_hdr.icmp6_data16[0]", NULL, {"mld_maxdelay"} }, { "mld_hdr mld_reserved define", ALIAS, ICMP6_H, "mld_hdr", - "mld_icmp6_hdr.icmp6_data16[1]", 0, .ft_dname="mld_reserved" }, + "mld_icmp6_hdr.icmp6_data16[1]", NULL, {"mld_reserved"} }, /* section 2.2.4, Router renumbering */ { "ICMP6_ROUTER_RENUMBERING", VALUE, ICMP6_H,"ICMP6_ROUTER_RENUMBERING", - 0, 0, .ft_dname="138" }, + NULL, NULL, {"138"} }, { "icmp6_router_renum rr_hdr", EXISTS, ICMP6_H, "icmp6_router_renum", - "rr_hdr", "0", .ft_value="sizeof(struct icmp6_hdr)" }, + "rr_hdr", "0", {"sizeof(struct icmp6_hdr)"} }, { "icmp6_router_renum rr_segnum", EXISTS, ICMP6_H, "icmp6_router_renum", - "rr_segnum", "sizeof(struct icmp6_hdr)", .ft_value="1" }, + "rr_segnum", "sizeof(struct icmp6_hdr)", {"1"} }, { "icmp6_router_renum rr_flags", EXISTS, ICMP6_H, "icmp6_router_renum", - "rr_flags", "sizeof(struct icmp6_hdr)+1", .ft_value="1" }, + "rr_flags", "sizeof(struct icmp6_hdr)+1", {"1"} }, { "icmp6_router_renum rr_maxdelay", EXISTS, ICMP6_H, "icmp6_router_renum", "rr_maxdelay", - "sizeof(struct icmp6_hdr)+2", .ft_value="2" }, + "sizeof(struct icmp6_hdr)+2", {"2"} }, { "icmp6_router_renum rr_reserved", EXISTS, ICMP6_H, "icmp6_router_renum", "rr_reserved", - "sizeof(struct icmp6_hdr)+4", .ft_value="4" }, + "sizeof(struct icmp6_hdr)+4", {"4"} }, { "icmp6_router_renum rr_type define", ALIAS, ICMP6_H, "icmp6_router_renum", "rr_hdr.icmp6_type", - 0, .ft_dname="rr_type" }, + NULL, {"rr_type"} }, { "icmp6_router_renum rr_code define", ALIAS, ICMP6_H, "icmp6_router_renum", "rr_hdr.icmp6_code", - 0, .ft_dname="rr_code" }, + NULL, {"rr_code"} }, { "icmp6_router_renum rr_cksum define", ALIAS, ICMP6_H, "icmp6_router_renum", "rr_hdr.icmp6_cksum", - 0, .ft_dname="rr_cksum" }, + NULL, {"rr_cksum"} }, { "icmp6_router_renum rr_seqnum define", ALIAS, ICMP6_H, "icmp6_router_renum", "rr_hdr.icmp6_data32[0]", - 0, .ft_dname="rr_seqnum" }, + NULL, {"rr_seqnum"} }, { "ICMP6_RR_FLAGS_TEST", VALUE, ICMP6_H, "ICMP6_RR_FLAGS_TEST", - 0, 0, .ft_dname="0x80" }, + NULL, NULL, {"0x80"} }, { "ICMP6_RR_FLAGS_REQRESULT", VALUE, ICMP6_H, - "ICMP6_RR_FLAGS_REQRESULT", 0, 0, .ft_dname="0x40" }, + "ICMP6_RR_FLAGS_REQRESULT", NULL, NULL, {"0x40"} }, { "ICMP6_RR_FLAGS_FORCEAPPLY", VALUE, ICMP6_H, - "ICMP6_RR_FLAGS_FORCEAPPLY", 0, 0, .ft_dname="0x20" }, + "ICMP6_RR_FLAGS_FORCEAPPLY", NULL, NULL, {"0x20"} }, { "ICMP6_RR_FLAGS_SPECSITE", VALUE, ICMP6_H, - "ICMP6_RR_FLAGS_SPECSITE", 0, 0, .ft_dname="0x10" }, + "ICMP6_RR_FLAGS_SPECSITE", NULL, NULL, {"0x10"} }, { "ICMP6_RR_FLAGS_PREVDONE", VALUE, ICMP6_H, - "ICMP6_RR_FLAGS_PREVDONE", 0, 0, .ft_dname="0x08" }, + "ICMP6_RR_FLAGS_PREVDONE", NULL, NULL, {"0x08"} }, { "rr_pco_match rpm_code", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_code", "0", .ft_value="1" }, + "rpm_code", "0", {"1"} }, { "rr_pco_match rpm_len", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_len", "1", .ft_value="1" }, + "rpm_len", "1", {"1"} }, { "rr_pco_match rpm_ordinal", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_ordinal", "2", .ft_value="1" }, + "rpm_ordinal", "2", {"1"} }, { "rr_pco_match rpm_matchlen", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_matchlen", "3", .ft_value="1" }, + "rpm_matchlen", "3", {"1"} }, { "rr_pco_match rpm_minlen", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_minlen", "4", .ft_value="1" }, + "rpm_minlen", "4", {"1"} }, { "rr_pco_match rpm_maxlen", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_maxlen", "5", .ft_value="1" }, + "rpm_maxlen", "5", {"1"} }, { "rr_pco_match rpm_reserved", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_reserved", "6", .ft_value="2" }, + "rpm_reserved", "6", {"2"} }, { "rr_pco_match rpm_prefix", EXISTS, ICMP6_H, "rr_pco_match", - "rpm_prefix", "8", .ft_value="sizeof(struct in6_addr)" }, + "rpm_prefix", "8", {"sizeof(struct in6_addr)"} }, - { "RPM_PCO_ADD", VALUE, ICMP6_H, "RPM_PCO_ADD", 0, 0, .ft_dname="1" }, - { "RPM_PCO_CHANGE", VALUE, ICMP6_H, "RPM_PCO_CHANGE", 0, 0, - .ft_dname="2" }, - { "RPM_PCO_SETGLOBAL", VALUE, ICMP6_H, "RPM_PCO_SETGLOBAL", 0, 0, - .ft_dname="3" }, + { "RPM_PCO_ADD", VALUE, ICMP6_H, "RPM_PCO_ADD", NULL, NULL, {"1"} }, + { "RPM_PCO_CHANGE", VALUE, ICMP6_H, "RPM_PCO_CHANGE", NULL, NULL, + {"2"} }, + { "RPM_PCO_SETGLOBAL", VALUE, ICMP6_H, "RPM_PCO_SETGLOBAL", NULL, NULL, + {"3"} }, { "rr_pco_use rpu_uselen", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_uselen", "0", .ft_value="1" }, + "rpu_uselen", "0", {"1"} }, { "rr_pco_use rpu_keeplen", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_keeplen", "1", .ft_value="1" }, + "rpu_keeplen", "1", {"1"} }, { "rr_pco_use rpu_ramask", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_ramask", "2", .ft_value="1" }, + "rpu_ramask", "2", {"1"} }, { "rr_pco_use rpu_raflags", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_raflags", "3", .ft_value="1" }, + "rpu_raflags", "3", {"1"} }, { "rr_pco_use rpu_vltime", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_vltime", "4", .ft_value="4" }, + "rpu_vltime", "4", {"4"} }, { "rr_pco_use rpu_pltime", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_pltime", "8", .ft_value="4" }, + "rpu_pltime", "8", {"4"} }, { "rr_pco_use rpu_flags", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_flags", "12", .ft_value="4" }, + "rpu_flags", "12", {"4"} }, { "rr_pco_use rpu_prefix", EXISTS, ICMP6_H, "rr_pco_use", - "rpu_prefix", "16", .ft_value="sizeof(struct in6_addr)" }, + "rpu_prefix", "16", {"sizeof(struct in6_addr)"} }, { "ICMP6_RR_PCOUSE_RAFLAGS_ONLINK", VALUE, ICMP6_H, - "ICMP6_RR_PCOUSE_RAFLAGS_ONLINK", 0, 0, .ft_dname="0x20" }, + "ICMP6_RR_PCOUSE_RAFLAGS_ONLINK", NULL, NULL, {"0x20"} }, { "ICMP6_RR_PCOUSE_RAFLAGS_AUTO", VALUE, ICMP6_H, - "ICMP6_RR_PCOUSE_RAFLAGS_AUTO", 0, 0, .ft_dname="0x10" }, + "ICMP6_RR_PCOUSE_RAFLAGS_AUTO", NULL, NULL, {"0x10"} }, { "ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME", VALUE, ICMP6_H, - "ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME", 0, 0, - .ft_dname="htonl(0x80000000)" }, + "ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME", NULL, NULL, + {"htonl(0x80000000)"} }, { "ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME", VALUE, ICMP6_H, - "ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME", 0, 0, - .ft_dname="htonl(0x40000000)" }, + "ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME", NULL, NULL, + {"htonl(0x40000000)"} }, { "rr_result rrr_flags", EXISTS, ICMP6_H, "rr_result", - "rrr_flags", "0", .ft_value="2" }, + "rrr_flags", "0", {"2"} }, { "rr_result rrr_ordinal", EXISTS, ICMP6_H, "rr_result", - "rrr_ordinal", "2", .ft_value="1" }, + "rrr_ordinal", "2", {"1"} }, { "rr_result rrr_matchedlen", EXISTS, ICMP6_H, "rr_result", - "rrr_matchedlen", "3", .ft_value="1" }, + "rrr_matchedlen", "3", {"1"} }, { "rr_result rrr_ifid", EXISTS, ICMP6_H, "rr_result", - "rrr_ifid", "4", .ft_value="4" }, + "rrr_ifid", "4", {"4"} }, { "rr_result rrr_prefix", EXISTS, ICMP6_H, "rr_result", - "rrr_prefix", "8", .ft_value="sizeof(struct in6_addr)" }, + "rrr_prefix", "8", {"sizeof(struct in6_addr)"} }, { "ICMP6_RR_RESULT_FLAGS_OOB", VALUE, ICMP6_H, - "ICMP6_RR_RESULT_FLAGS_OOB", 0, 0, - .ft_dname="htons(0x0002)" }, + "ICMP6_RR_RESULT_FLAGS_OOB", NULL, NULL, + {"htons(0x0002)"} }, { "ICMP6_RR_RESULT_FLAGS_FORBIDDEN", VALUE, ICMP6_H, - "ICMP6_RR_RESULT_FLAGS_FORBIDDEN", 0, 0, - .ft_dname="htons(0x0001)" }, + "ICMP6_RR_RESULT_FLAGS_FORBIDDEN", NULL, NULL, + {"htons(0x0001)"} }, }; #define FTCOUNT (sizeof(ftab)/sizeof(ftab[0])) diff --git a/testcases/network/lib6/asapi_05.c b/testcases/network/lib6/asapi_05.c index adcf067..f95bec7 100644 --- a/testcases/network/lib6/asapi_05.c +++ b/testcases/network/lib6/asapi_05.c @@ -98,45 +98,45 @@ struct etent { } etab[] = { /* existence checks, RFC 3542 section 3 */ { "icmp6_filter icmp6_filt", EXISTS, ICMP6_H, "icmp6_filter", - "icmp6_filt", "0", .et_value="32" }, + "icmp6_filt", "0", {"32"} }, { "icmp6_filter icmp6_filt[0]", EXISTS, ICMP6_H, "icmp6_filter", - "icmp6_filt[0]", "0", .et_value="4" }, + "icmp6_filt[0]", "0", {"4"} }, { "ICMP6_FILTER_WILLPASS", DEFINED, ICMP6_H, "ICMP6_FILTER_WILLPASS", - 0, 0, {0} }, + NULL, NULL, {0} }, { "ICMP6_FILTER_WILLBLOCK", DEFINED, ICMP6_H, "ICMP6_FILTER_WILLBLOCK", - 0, 0, {0} }, + NULL, NULL, {0} }, { "ICMP6_FILTER_SETPASS", DEFINED, ICMP6_H, "ICMP6_FILTER_SETPASS", - 0, 0, {0} }, + NULL, NULL, {0} }, { "ICMP6_FILTER_SETBLOCK", DEFINED, ICMP6_H, "ICMP6_FILTER_SETBLOCK", - 0, 0, {0} }, + NULL, NULL, {0} }, { "ICMP6_FILTER_SETPASSALL", DEFINED, ICMP6_H,"ICMP6_FILTER_SETPASSALL", - 0, 0, {0} }, + NULL, NULL, {0} }, { "ICMP6_FILTER_SETBLOCKALL",DEFINED,ICMP6_H,"ICMP6_FILTER_SETBLOCKALL", - 0, 0, {0} }, - { "ICMP6_FILTER", DEFINED, ICMP6_H, "ICMP6_FILTER", 0, 0, {0} }, + NULL, NULL, {0} }, + { "ICMP6_FILTER", DEFINED, ICMP6_H, "ICMP6_FILTER", NULL, NULL, {0} }, /* existence checks, RFC 3542 section 4 */ /* socket options */ - { "IPV6_RECVPKTINFO", VALUE, IN_H, "IPV6_RECVPKTINFO", 0, 0, - .et_dname="IPV6_RECVPKTINFO" }, - { "IPV6_RECVHOPLIMIT", VALUE, IN_H, "IPV6_RECVHOPLIMIT", 0, 0, - .et_dname="IPV6_RECVHOPLIMIT" }, - { "IPV6_RECVRTHDR", VALUE, IN_H, "IPV6_RECVRTHDR", 0, 0, - .et_dname="IPV6_RECVRTHDR" }, - { "IPV6_RECVHOPOPTS", VALUE, IN_H, "IPV6_RECVHOPOPTS", 0, 0, - .et_dname="IPV6_RECVHOPOPTS" }, - { "IPV6_RECVDSTOPTS", VALUE, IN_H, "IPV6_RECVDSTOPTS", 0, 0, - .et_dname="IPV6_RECVDSTOPTS" }, - { "IPV6_RECVTCLASS", VALUE, IN_H, "IPV6_RECVTCLASS", 0, 0, - .et_dname="IPV6_RECVTCLASS" }, + { "IPV6_RECVPKTINFO", VALUE, IN_H, "IPV6_RECVPKTINFO", NULL, NULL, + {"IPV6_RECVPKTINFO"} }, + { "IPV6_RECVHOPLIMIT", VALUE, IN_H, "IPV6_RECVHOPLIMIT", NULL, NULL, + {"IPV6_RECVHOPLIMIT"} }, + { "IPV6_RECVRTHDR", VALUE, IN_H, "IPV6_RECVRTHDR", NULL, NULL, + {"IPV6_RECVRTHDR"} }, + { "IPV6_RECVHOPOPTS", VALUE, IN_H, "IPV6_RECVHOPOPTS", NULL, NULL, + {"IPV6_RECVHOPOPTS"} }, + { "IPV6_RECVDSTOPTS", VALUE, IN_H, "IPV6_RECVDSTOPTS", NULL, NULL, + {"IPV6_RECVDSTOPTS"} }, + { "IPV6_RECVTCLASS", VALUE, IN_H, "IPV6_RECVTCLASS", NULL, NULL, + {"IPV6_RECVTCLASS"} }, /* cmsg types */ - { "IPV6_PKTINFO", DEFINED, IN_H, "IPV6_PKTINFO", 0, 0, {0} }, - { "IPV6_HOPLIMIT", DEFINED, IN_H, "IPV6_HOPLIMIT", 0, 0, {0} }, - { "IPV6_NEXTHOP", DEFINED, IN_H, "IPV6_NEXTHOP", 0, 0, {0} }, - { "IPV6_RTHDR", DEFINED, IN_H, "IPV6_RTHDR", 0, 0, {0} }, - { "IPV6_HOPOPTS", DEFINED, IN_H, "IPV6_HOPOPTS", 0, 0, {0} }, - { "IPV6_DSTOPTS", DEFINED, IN_H, "IPV6_DSTOPTS", 0, 0, {0} }, - { "IPV6_RTHDRDSTOPTS", DEFINED, IN_H, "IPV6_RTHDRDSTOPTS", 0, 0, {0} }, - { "IPV6_TCLASS", DEFINED, IN_H, "IPV6_TCLASS", 0, 0, {0} }, + { "IPV6_PKTINFO", DEFINED, IN_H, "IPV6_PKTINFO", NULL, NULL, {0} }, + { "IPV6_HOPLIMIT", DEFINED, IN_H, "IPV6_HOPLIMIT", NULL, NULL, {0} }, + { "IPV6_NEXTHOP", DEFINED, IN_H, "IPV6_NEXTHOP", NULL, NULL, {0} }, + { "IPV6_RTHDR", DEFINED, IN_H, "IPV6_RTHDR", NULL, NULL, {0} }, + { "IPV6_HOPOPTS", DEFINED, IN_H, "IPV6_HOPOPTS", NULL, NULL, {0} }, + { "IPV6_DSTOPTS", DEFINED, IN_H, "IPV6_DSTOPTS", NULL, NULL, {0} }, + { "IPV6_RTHDRDSTOPTS", DEFINED, IN_H, "IPV6_RTHDRDSTOPTS", NULL, NULL, {0} }, + { "IPV6_TCLASS", DEFINED, IN_H, "IPV6_TCLASS", NULL, NULL, {0} }, }; #define ETCOUNT (sizeof(etab)/sizeof(etab[0])) diff --git a/testcases/network/lib6/asapi_06.c b/testcases/network/lib6/asapi_06.c index 418dfc0..99694ce 100644 --- a/testcases/network/lib6/asapi_06.c +++ b/testcases/network/lib6/asapi_06.c @@ -153,6 +153,7 @@ union soval { #define IN6_LOOP {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 } #define IN6_ANY {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } +/* so_clrval and so_setval members are initilized in the body */ struct soent { char *so_tname; int so_opt; @@ -165,31 +166,31 @@ struct soent { } sotab[] = { /* RFC 3542, Section 4 */ { "IPV6_RECVPKTINFO", IPV6_RECVPKTINFO, 1, IPV6_PKTINFO, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_RECVHOPLIMIT", IPV6_RECVHOPLIMIT, 1, IPV6_HOPLIMIT, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_RECVRTHDR", IPV6_RECVRTHDR, 0, IPV6_RTHDR, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_RECVHOPOPTS", IPV6_RECVHOPOPTS, 0, IPV6_HOPOPTS, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_RECVDSTOPTS", IPV6_RECVDSTOPTS, 0, IPV6_DSTOPTS, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_RECVTCLASS", IPV6_RECVTCLASS, 1, IPV6_TCLASS, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, /* make sure TCLASS stays when setting another opt */ { "IPV6_RECVTCLASS (2)", IPV6_RECVHOPLIMIT, 1, IPV6_TCLASS, 0, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, /* OLD values */ { "IPV6_2292PKTINFO", IPV6_2292PKTINFO, 1, IPV6_2292PKTINFO, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_2292HOPLIMIT", IPV6_2292HOPLIMIT, 1, IPV6_2292HOPLIMIT, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_2292RTHDR", IPV6_2292RTHDR, 0, IPV6_2292RTHDR, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_2292HOPOPTS", IPV6_2292HOPOPTS, 0, IPV6_2292HOPOPTS, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, { "IPV6_2292DSTOPTS", IPV6_2292DSTOPTS, 0, IPV6_2292DSTOPTS, 1, - .so_clrval.sou_bool=0, .so_setval.sou_bool=1, sizeof(int) }, + {{{{{0}}}}}, {{{{{0}}}}}, sizeof(int) }, }; #define SOCOUNT (sizeof(sotab)/sizeof(sotab[0])) @@ -225,8 +226,8 @@ struct cme { uint32_t cmu_hops; } cmu; } cmtab[] = { - { sizeof(uint32_t), SOL_IPV6, IPV6_TCLASS, .cmu.cmu_tclass=0x12 }, - { sizeof(uint32_t), SOL_IPV6, IPV6_HOPLIMIT, .cmu.cmu_hops=0x21 }, + { sizeof(uint32_t), SOL_IPV6, IPV6_TCLASS, {0x12} }, + { sizeof(uint32_t), SOL_IPV6, IPV6_HOPLIMIT, {0x21} }, }; #define CMCOUNT (sizeof(cmtab)/sizeof(cmtab[0])) @@ -612,6 +613,8 @@ do_tests(void) int i; for (i=0; i<SOCOUNT; ++i) { + sotab[i].so_clrval.sou_bool = 0; + sotab[i].so_setval.sou_bool = 1; so_test(&sotab[i]); } #ifdef notyet diff --git a/testcases/network/lib6/asapi_07.c b/testcases/network/lib6/asapi_07.c index 5cf1d8e..e5f2b1a 100644 --- a/testcases/network/lib6/asapi_07.c +++ b/testcases/network/lib6/asapi_07.c @@ -97,30 +97,30 @@ struct etent { } etab[] = { /* existence checks, RFC 3542 sections 5, 20 */ { "msghdr msg_name", EXISTS, SOCKET_H, "msghdr", - "msg_name", 0, .et_value="sizeof(void *)" }, + "msg_name", NULL, {"sizeof(void *)"} }, { "msghdr msg_namelen", EXISTS, SOCKET_H, "msghdr", - "msg_namelen", 0, .et_value="sizeof(socklen_t)"}, + "msg_namelen", NULL, {"sizeof(socklen_t)"} }, { "msghdr msg_iov", EXISTS, SOCKET_H, "msghdr", - "msg_iov", 0, .et_value="sizeof(struct iovec *)" }, + "msg_iov", NULL, {"sizeof(struct iovec *)"} }, { "msghdr msg_iovlen", EXISTS, SOCKET_H, "msghdr", - "msg_iovlen", 0, .et_value="sizeof(struct iovec *)"}, + "msg_iovlen", NULL, {"sizeof(struct iovec *)"} }, { "msghdr msg_control", EXISTS, SOCKET_H, "msghdr", - "msg_control", 0, .et_value="sizeof(void *)"}, + "msg_control", NULL, {"sizeof(void *)"} }, { "msghdr msg_controllen", EXISTS, SOCKET_H, "msghdr", - "msg_controllen", 0, .et_value="sizeof(socklen_t)"}, + "msg_controllen", NULL, {"sizeof(socklen_t)"} }, { "msghdr msg_flags", EXISTS, SOCKET_H, "msghdr", - "msg_flags", 0, .et_value="sizeof(int)"}, + "msg_flags", NULL, {"sizeof(int)"} }, { "cmsghdr cmsg_len", EXISTS, SOCKET_H, "cmsghdr", - "cmsg_len", 0, .et_value="sizeof(socklen_t)"}, + "cmsg_len", NULL, {"sizeof(socklen_t)"} }, { "cmsghdr cmsg_level", EXISTS, SOCKET_H, "cmsghdr", - "cmsg_level", 0, .et_value="sizeof(int)"}, + "cmsg_level", NULL, {"sizeof(int)"} }, { "cmsghdr cmsg_type", EXISTS, SOCKET_H, "cmsghdr", - "cmsg_type", 0, .et_value="sizeof(int)"}, - { "CMSG_DATA", DEFINED, SOCKET_H, "CMSG_DATA", 0, 0, {0}}, - { "CMSG_NXTHDR", DEFINED, SOCKET_H, "CMSG_NXTHDR", 0, 0, {0}}, - { "CMSG_FIRSTHDR", DEFINED, SOCKET_H, "CMSG_FIRSTHDR", 0, 0, {0}}, - { "CMSG_SPACE", DEFINED, SOCKET_H, "CMSG_SPACE", 0, 0, {0}}, - { "CMSG_LEN", DEFINED, SOCKET_H, "CMSG_LEN", 0, 0, {0}}, + "cmsg_type", NULL, {"sizeof(int)"} }, + { "CMSG_DATA", DEFINED, SOCKET_H, "CMSG_DATA", NULL, NULL, {0}}, + { "CMSG_NXTHDR", DEFINED, SOCKET_H, "CMSG_NXTHDR", NULL, NULL, {0}}, + { "CMSG_FIRSTHDR", DEFINED, SOCKET_H, "CMSG_FIRSTHDR", NULL, NULL, {0}}, + { "CMSG_SPACE", DEFINED, SOCKET_H, "CMSG_SPACE", NULL, NULL, {0}}, + { "CMSG_LEN", DEFINED, SOCKET_H, "CMSG_LEN", NULL, NULL, {0}}, }; #define ETCOUNT (sizeof(etab)/sizeof(etab[0])) -- 1.5.6 ------------------------------------------------------------------------------ SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
