[libvirt] [PATCH V1 1/2] nwfilter: Add names for more l4 protocols

Extend the list of names of layer 4 protocols. They are used in translating names to IP layer 4 protocol IDs. I added strings for those protocols where Wikipedia mentions RFCs and a few others that seem to be used (pim, fc). http://en.wikipedia.org/wiki/List_of_IP_protocol_numbers --- src/conf/nwfilter_conf.c | 57 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 8 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -698,19 +698,60 @@ arpOpcodeFormatter(virBufferPtr buf, static const struct int_map ipProtoMap[] = { + INTMAP_ENTRY(0x0, "hopopt"), + INTMAP_ENTRY(IPPROTO_ICMP, "icmp"), + INTMAP_ENTRY(IPPROTO_IGMP, "igmp"), + INTMAP_ENTRY( 3, "ggp"), + INTMAP_ENTRY( 4, "ipv4"), + INTMAP_ENTRY( 5, "st"), INTMAP_ENTRY(IPPROTO_TCP, "tcp"), + INTMAP_ENTRY( 7, "cbt"), + INTMAP_ENTRY( 8, "egp"), + INTMAP_ENTRY( 11, "nvp"), INTMAP_ENTRY(IPPROTO_UDP, "udp"), -#ifdef IPPROTO_UDPLITE - INTMAP_ENTRY(IPPROTO_UDPLITE, "udplite"), -#endif + INTMAP_ENTRY( 20, "hmp"), + INTMAP_ENTRY( 27, "rdp"), + INTMAP_ENTRY( 28, "irtp"), + INTMAP_ENTRY( 29, "iso-tp4"), + INTMAP_ENTRY( 30, "netblt"), + INTMAP_ENTRY( 33, "dccp"), + INTMAP_ENTRY( 35, "idpr"), + INTMAP_ENTRY( 41, "ipv6"), + INTMAP_ENTRY( 42, "sdrp"), + INTMAP_ENTRY( 43, "ipv6-route"), + INTMAP_ENTRY( 44, "ipv6-frag"), + INTMAP_ENTRY( 46, "rsvp"), + INTMAP_ENTRY( 47, "gre"), INTMAP_ENTRY(IPPROTO_ESP, "esp"), INTMAP_ENTRY(IPPROTO_AH, "ah"), - INTMAP_ENTRY(IPPROTO_ICMP, "icmp"), - INTMAP_ENTRY(IPPROTO_IGMP, "igmp"), -#ifdef IPPROTO_SCTP - INTMAP_ENTRY(IPPROTO_SCTP, "sctp"), -#endif + INTMAP_ENTRY( 54, "narp"), + INTMAP_ENTRY( 55, "mobile"), + INTMAP_ENTRY( 57, "skip"), INTMAP_ENTRY(IPPROTO_ICMPV6, "icmpv6"), + INTMAP_ENTRY(IPPROTO_ICMPV6, "ipv6-icmp"), + INTMAP_ENTRY( 59, "ipv6-nonxt"), + INTMAP_ENTRY( 60, "ipv6-opts"), + INTMAP_ENTRY( 81, "vmtp"), + INTMAP_ENTRY( 82, "secure-vmtp"), + INTMAP_ENTRY( 89, "ospf"), + INTMAP_ENTRY( 97, "etherip"), + INTMAP_ENTRY( 98, "encap"), + INTMAP_ENTRY(103, "pim"), + INTMAP_ENTRY(108, "ipcomp"), + INTMAP_ENTRY(112, "vrrp"), + INTMAP_ENTRY(113, "pgm"), + INTMAP_ENTRY(115, "l2tp"), + INTMAP_ENTRY(132, "sctp"), + INTMAP_ENTRY(133, "fc"), + INTMAP_ENTRY(134, "rsvp-e2e-ignore"), + INTMAP_ENTRY(135, "mobility-header"), + INTMAP_ENTRY(136, "udplite"), + INTMAP_ENTRY(137, "mpls-in-ip"), + INTMAP_ENTRY(138, "manet"), + INTMAP_ENTRY(139, "hip"), + INTMAP_ENTRY(140, "shim6"), + INTMAP_ENTRY(141, "wesp"), + INTMAP_ENTRY(142, "rohc"), INTMAP_ENTRY_LAST };