ICMP bug / patch against fixes.1

[Peter Van Epp]

	There is one more ICMP code ("EXP" for experimental) that isn't in 
argus_util.h. Getting one (which I have a couple of times over the last week)
causes a seg fault in ra. Below is an additional argus_util.h patch (with an 
earlier fix included) that fixes this. The count already included code 41,
there just wasn't any text to go with it.

Peter Van Epp / Operations and Technical Support 
Simon Fraser University, Burnaby, B.C. Canada

*** include/argus_util.h.orig	Mon Aug 25 13:00:01 2003
--- include/argus_util.h	Thu Apr 28 11:05:45 2005
***************
*** 142,171 ****
  
  #define TSEQ_HASHSIZE	9029
  #define HASHNAMESIZE	4096
! #define IPPROTOSTR	134
  
  #define ipaddr_string(p) getname((u_char *)(p))
  
  #ifdef ArgusUtil
  
! char *ip_proto_string [IPPROTOSTR] = {"ip", "icmp", "igmp", "ggp",
!    "ipnip", "st", "tcp", "ucl", "egp", "igp", "bbn-rcc-mon", "nvp-ii",
     "pup", "argus", "emcon", "xnet", "chaos", "udp", "mux", "dcn-meas",
     "hmp", "prm", "xns-idp", "trunk-1", "trunk-2", "leaf-1", "leaf-2",
     "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp", "merit-inp", "sep",
     "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++", "il", "ipv6",
     "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre", "mhrp", "bna",
     "esp", "ah", "i-nlsp", "swipe", "narp", "mobile", "tlsp", "skip",
!    "ipv6-icmp", "ipv6-no", "ipv6-opts", "any", "cftp", "any", "sat-expak", "kryptolan",
!    "rvd", "ippc", "any", "sat-mon", "visa", "ipcv", "cpnx", "cphb", "wsn",
!    "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak", "iso-ip", "vmtp",
!    "secure-vmtp", "vines", "ttp", "nsfnet-igp", "dgp", "tcf", "igrp",
!    "ospfigp", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
!    "aes-sp3-d", "etherip", "encap", "pri-enc", "gmtp", "ifmp", "pnni",
!    "pim", "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer",
     "ipx-n-ip", "vrrp", "pgm", "zero", "l2tp", "ddx", "iatp", "stp", "srp",
!    "uti", "smp", "ptp", "isis", "fire", "crtp", "crudp", "sccopmce", "iplt",
!    "sps", "pipe", "sctp", "fc",
  };
  
  #if defined(__OpenBSD__)
--- 142,172 ----
  
  #define TSEQ_HASHSIZE	9029
  #define HASHNAMESIZE	4096
! #define IPPROTOSTR	138
  
  #define ipaddr_string(p) getname((u_char *)(p))
  
  #ifdef ArgusUtil
  
! char *ip_proto_string [IPPROTOSTR] = {"hopopt", "icmp", "igmp", "ggp",
!    "ipnip", "st", "tcp", "cbt", "egp", "igp", "bbn-rcc-mon", "nvp-ii",
     "pup", "argus", "emcon", "xnet", "chaos", "udp", "mux", "dcn-meas",
     "hmp", "prm", "xns-idp", "trunk-1", "trunk-2", "leaf-1", "leaf-2",
     "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp", "merit-inp", "sep",
     "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++", "il", "ipv6",
     "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre", "mhrp", "bna",
     "esp", "ah", "i-nlsp", "swipe", "narp", "mobile", "tlsp", "skip",
!    "ipv6-icmp", "ipv6-noinxt", "ipv6-opts", "any-p", "cftp", "any-n",
!    "sat-expak", "kryptolan", "rvd", "ippc", "any-dfs", "sat-mon", "visa", 
!    "ipcv", "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon",
!    "wb-expak", "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nsfnet-igp",
!    "dgp", "tcf", "eigrp", "ospfigp", "sprite-rpc", "larp", "mtp", "ax.25",
!    "ipip", "micp", "scc-sp", "etherip", "encap", "pri-enc", "gmtp", "ifmp",
!    "pnni", "pim", "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer",
     "ipx-n-ip", "vrrp", "pgm", "zero", "l2tp", "ddx", "iatp", "stp", "srp",
!    "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crudp", "sccopmce", 
!    "iplt", "sps", "pipe", "sctp", "fc", "rsvp-e2e", "mobility", "udplite",
!    "mpls-n-ip",
  };
  
  #if defined(__OpenBSD__)
***************
*** 183,189 ****
     "MSR", "SEC", "ROB", "ROB", "ROB", "ROB",
     "ROB", "ROB", "ROB", "ROB", "ROB", "ROB",
     "TRC", "DCE", "MHR", "WAY", "IAH", "MRQ",
!    "MRP", "DNQ", "DNP", "SKP", "PHO",
  };   
  
  
--- 184,190 ----
     "MSR", "SEC", "ROB", "ROB", "ROB", "ROB",
     "ROB", "ROB", "ROB", "ROB", "ROB", "ROB",
     "TRC", "DCE", "MHR", "WAY", "IAH", "MRQ",
!    "MRP", "DNQ", "DNP", "SKP", "PHO", "EXP",
  };