Rename the routines that handle dissector tables with unsigned integer
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 20 Dec 2010 05:35:29 +0000 (05:35 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 20 Dec 2010 05:35:29 +0000 (05:35 +0000)
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35224 f5534014-38df-0310-8fa8-9805f1628bb7

680 files changed:
asn1/ansi_map/ansi_map.cnf
asn1/ansi_tcap/packet-ansi_tcap-template.c
asn1/cmp/packet-cmp-template.c
asn1/dap/packet-dap-template.c
asn1/disp/packet-disp-template.c
asn1/dop/packet-dop-template.c
asn1/dsp/packet-dsp-template.c
asn1/goose/packet-goose-template.c
asn1/gsm_map/gsm_map.cnf
asn1/h225/h225.cnf
asn1/h225/packet-h225-template.c
asn1/h245/h245.cnf
asn1/h248/packet-h248-template.c
asn1/h450/packet-h450-template.c
asn1/h501/packet-h501-template.c
asn1/hnbap/packet-hnbap-template.c
asn1/idmp/packet-idmp-template.c
asn1/kerberos/packet-kerberos-template.c
asn1/ldap/packet-ldap-template.c
asn1/mpeg-pes/packet-mpeg-pes-template.c
asn1/nbap/packet-nbap-template.c
asn1/p7/packet-p7-template.c
asn1/pcap/packet-pcap-template.c
asn1/q932/packet-q932-template.c
asn1/qsig/packet-qsig-template.c
asn1/ranap/packet-ranap-template.c
asn1/ranap/ranap.cnf
asn1/rnsap/packet-rnsap-template.c
asn1/ros/ros-err.cnf
asn1/ros/ros-inv.cnf
asn1/ros/ros-res.cnf
asn1/rua/packet-rua-template.c
asn1/s1ap/packet-s1ap-template.c
asn1/sabp/packet-sabp-template.c
asn1/smrse/packet-smrse-template.c
asn1/snmp/packet-snmp-template.c
asn1/sv/packet-sv-template.c
asn1/t38/packet-t38-template.c
asn1/tcap/packet-tcap-template.c
asn1/ulp/packet-ulp-template.c
asn1/x2ap/packet-x2ap-template.c
asn1/x411/packet-x411-template.c
asn1/x411/x411.cnf
doc/README.developer
doc/README.heuristic
doc/README.python
docbook/wsdg_src/WSDG_chapter_dissection.xml
epan/dissectors/packet-2dparityfec.c
epan/dissectors/packet-3com-njack.c
epan/dissectors/packet-3com-xns.c
epan/dissectors/packet-3g-a11.c
epan/dissectors/packet-9p.c
epan/dissectors/packet-HI2Operations.c
epan/dissectors/packet-aarp.c
epan/dissectors/packet-acap.c
epan/dissectors/packet-actrace.c
epan/dissectors/packet-adwin.c
epan/dissectors/packet-agentx.c
epan/dissectors/packet-aim-oft.c
epan/dissectors/packet-aim.c
epan/dissectors/packet-airopeek.c
epan/dissectors/packet-ajp13.c
epan/dissectors/packet-alcap.c
epan/dissectors/packet-amqp.c
epan/dissectors/packet-amr.c
epan/dissectors/packet-ancp.c
epan/dissectors/packet-ans.c
epan/dissectors/packet-ansi_637.c
epan/dissectors/packet-ansi_683.c
epan/dissectors/packet-ansi_801.c
epan/dissectors/packet-ansi_a.c
epan/dissectors/packet-ansi_map.c
epan/dissectors/packet-ansi_tcap.c
epan/dissectors/packet-aodv.c
epan/dissectors/packet-aoe.c
epan/dissectors/packet-ap1394.c
epan/dissectors/packet-arcnet.c
epan/dissectors/packet-armagetronad.c
epan/dissectors/packet-arp.c
epan/dissectors/packet-artnet.c
epan/dissectors/packet-aruba-adp.c
epan/dissectors/packet-aruba-erm.c
epan/dissectors/packet-aruba-papi.c
epan/dissectors/packet-asap.c
epan/dissectors/packet-ascend.c
epan/dissectors/packet-asf.c
epan/dissectors/packet-assa_r3.c
epan/dissectors/packet-atalk.c
epan/dissectors/packet-atm.c
epan/dissectors/packet-auto_rp.c
epan/dissectors/packet-ax4000.c
epan/dissectors/packet-ayiya.c
epan/dissectors/packet-bacapp.c
epan/dissectors/packet-bacnet.c
epan/dissectors/packet-banana.c
epan/dissectors/packet-bat.c
epan/dissectors/packet-batadv.c
epan/dissectors/packet-bctp.c
epan/dissectors/packet-beep.c
epan/dissectors/packet-ber.c
epan/dissectors/packet-bfd.c
epan/dissectors/packet-bgp.c
epan/dissectors/packet-bittorrent.c
epan/dissectors/packet-bjnp.c
epan/dissectors/packet-bofl.c
epan/dissectors/packet-bootp.c
epan/dissectors/packet-bpdu.c
epan/dissectors/packet-brdwlk.c
epan/dissectors/packet-bssap.c
epan/dissectors/packet-btamp.c
epan/dissectors/packet-bthci_acl.c
epan/dissectors/packet-bthci_cmd.c
epan/dissectors/packet-bthci_evt.c
epan/dissectors/packet-bthci_sco.c
epan/dissectors/packet-btl2cap.c
epan/dissectors/packet-btrfcomm.c
epan/dissectors/packet-btsdp.c
epan/dissectors/packet-bvlc.c
epan/dissectors/packet-calcappprotocol.c
epan/dissectors/packet-capwap.c
epan/dissectors/packet-cast.c
epan/dissectors/packet-catapult-dct2000.c
epan/dissectors/packet-cdp.c
epan/dissectors/packet-cfm.c
epan/dissectors/packet-cgmp.c
epan/dissectors/packet-chdlc.c
epan/dissectors/packet-cimetrics.c
epan/dissectors/packet-cip.c
epan/dissectors/packet-cisco-erspan.c
epan/dissectors/packet-cisco-wids.c
epan/dissectors/packet-classicstun.c
epan/dissectors/packet-clip.c
epan/dissectors/packet-clnp.c
epan/dissectors/packet-cmp.c
epan/dissectors/packet-cmpp.c
epan/dissectors/packet-coap.c
epan/dissectors/packet-collectd.c
epan/dissectors/packet-componentstatus.c
epan/dissectors/packet-cops.c
epan/dissectors/packet-cosine.c
epan/dissectors/packet-cpfi.c
epan/dissectors/packet-cpha.c
epan/dissectors/packet-csm-encaps.c
epan/dissectors/packet-cups.c
epan/dissectors/packet-dap.c
epan/dissectors/packet-daytime.c
epan/dissectors/packet-db-lsp.c
epan/dissectors/packet-dccp.c
epan/dissectors/packet-dcm.c
epan/dissectors/packet-dcp-etsi.c
epan/dissectors/packet-ddtp.c
epan/dissectors/packet-dec-bpdu.c
epan/dissectors/packet-dec-dnart.c
epan/dissectors/packet-dect.c
epan/dissectors/packet-dhcp-failover.c
epan/dissectors/packet-dhcpv6.c
epan/dissectors/packet-diameter.c
epan/dissectors/packet-diameter_3gpp.c
epan/dissectors/packet-dis.c
epan/dissectors/packet-disp.c
epan/dissectors/packet-distcc.c
epan/dissectors/packet-dlm3.c
epan/dissectors/packet-dlsw.c
epan/dissectors/packet-dmp.c
epan/dissectors/packet-dnp.c
epan/dissectors/packet-dns.c
epan/dissectors/packet-dop.c
epan/dissectors/packet-dpnss-link.c
epan/dissectors/packet-dsi.c
epan/dissectors/packet-dsp.c
epan/dissectors/packet-dtn.c
epan/dissectors/packet-dtp.c
epan/dissectors/packet-dtpt.c
epan/dissectors/packet-dua.c
epan/dissectors/packet-eap.c
epan/dissectors/packet-eapol.c
epan/dissectors/packet-echo.c
epan/dissectors/packet-edonkey.c
epan/dissectors/packet-egd.c
epan/dissectors/packet-eigrp.c
epan/dissectors/packet-enc.c
epan/dissectors/packet-enip.c
epan/dissectors/packet-enrp.c
epan/dissectors/packet-enttec.c
epan/dissectors/packet-epl.c
epan/dissectors/packet-epl_v1.c
epan/dissectors/packet-epmd.c
epan/dissectors/packet-erf.c
epan/dissectors/packet-esio.c
epan/dissectors/packet-esis.c
epan/dissectors/packet-etch.c
epan/dissectors/packet-eth.c
epan/dissectors/packet-etherip.c
epan/dissectors/packet-ethertype.c
epan/dissectors/packet-evrc.c
epan/dissectors/packet-exec.c
epan/dissectors/packet-extreme.c
epan/dissectors/packet-fc.c
epan/dissectors/packet-fcct.c
epan/dissectors/packet-fcdns.c
epan/dissectors/packet-fcels.c
epan/dissectors/packet-fcfcs.c
epan/dissectors/packet-fcfzs.c
epan/dissectors/packet-fcgi.c
epan/dissectors/packet-fcoe.c
epan/dissectors/packet-fcp.c
epan/dissectors/packet-fcsb3.c
epan/dissectors/packet-fcswils.c
epan/dissectors/packet-fddi.c
epan/dissectors/packet-fefd.c
epan/dissectors/packet-ff.c
epan/dissectors/packet-fip.c
epan/dissectors/packet-fix.c
epan/dissectors/packet-flip.c
epan/dissectors/packet-fr.c
epan/dissectors/packet-fractalgeneratorprotocol.c
epan/dissectors/packet-frame.c
epan/dissectors/packet-ftp.c
epan/dissectors/packet-g723.c
epan/dissectors/packet-gdsdb.c
epan/dissectors/packet-gift.c
epan/dissectors/packet-git.c
epan/dissectors/packet-glbp.c
epan/dissectors/packet-gmhdr.c
epan/dissectors/packet-gnutella.c
epan/dissectors/packet-goose.c
epan/dissectors/packet-gopher.c
epan/dissectors/packet-gprs-llc.c
epan/dissectors/packet-gre.c
epan/dissectors/packet-gsm_a_bssmap.c
epan/dissectors/packet-gsm_a_dtap.c
epan/dissectors/packet-gsm_a_gm.c
epan/dissectors/packet-gsm_a_rp.c
epan/dissectors/packet-gsm_bssmap_le.c
epan/dissectors/packet-gsm_ipa.c
epan/dissectors/packet-gsm_map.c
epan/dissectors/packet-gsm_sms.c
epan/dissectors/packet-gsm_sms_ud.c
epan/dissectors/packet-gsm_um.c
epan/dissectors/packet-gsmtap.c
epan/dissectors/packet-gtp.c
epan/dissectors/packet-gtpv2.c
epan/dissectors/packet-gvcp.c
epan/dissectors/packet-h221_nonstd.c
epan/dissectors/packet-h223.c
epan/dissectors/packet-h225.c
epan/dissectors/packet-h245.c
epan/dissectors/packet-h248.c
epan/dissectors/packet-h261.c
epan/dissectors/packet-h263p.c
epan/dissectors/packet-h264.c
epan/dissectors/packet-h450-ros.c
epan/dissectors/packet-h450.c
epan/dissectors/packet-h501.c
epan/dissectors/packet-hci_h1.c
epan/dissectors/packet-hci_h4.c
epan/dissectors/packet-hip.c
epan/dissectors/packet-hnbap.c
epan/dissectors/packet-homeplug.c
epan/dissectors/packet-hp-erm.c
epan/dissectors/packet-hpext.c
epan/dissectors/packet-hpsw.c
epan/dissectors/packet-hpteam.c
epan/dissectors/packet-hsrp.c
epan/dissectors/packet-http.c
epan/dissectors/packet-hyperscsi.c
epan/dissectors/packet-i2c.c
epan/dissectors/packet-iapp.c
epan/dissectors/packet-iax2.c
epan/dissectors/packet-icap.c
epan/dissectors/packet-icmp.c
epan/dissectors/packet-icmpv6.c
epan/dissectors/packet-icp.c
epan/dissectors/packet-icq.c
epan/dissectors/packet-idmp.c
epan/dissectors/packet-idp.c
epan/dissectors/packet-iec104.c
epan/dissectors/packet-ieee1722.c
epan/dissectors/packet-ieee80211.c
epan/dissectors/packet-ieee802154.c
epan/dissectors/packet-ieee8021ah.c
epan/dissectors/packet-ieee802a.c
epan/dissectors/packet-igmp.c
epan/dissectors/packet-igrp.c
epan/dissectors/packet-image-jfif.c
epan/dissectors/packet-imap.c
epan/dissectors/packet-infiniband.c
epan/dissectors/packet-ip.c
epan/dissectors/packet-ipdc.c
epan/dissectors/packet-ipfc.c
epan/dissectors/packet-ipmi-session.c
epan/dissectors/packet-ipnet.c
epan/dissectors/packet-ipsec-tcp.c
epan/dissectors/packet-ipsec-udp.c
epan/dissectors/packet-ipsec.c
epan/dissectors/packet-ipsi-ctl.c
epan/dissectors/packet-ipv6.c
epan/dissectors/packet-ipvs-syncd.c
epan/dissectors/packet-ipx.c
epan/dissectors/packet-ipxwan.c
epan/dissectors/packet-irc.c
epan/dissectors/packet-isakmp.c
epan/dissectors/packet-isdn.c
epan/dissectors/packet-isis.c
epan/dissectors/packet-ismacryp.c
epan/dissectors/packet-ismp.c
epan/dissectors/packet-isns.c
epan/dissectors/packet-isup.c
epan/dissectors/packet-itdm.c
epan/dissectors/packet-iua.c
epan/dissectors/packet-iuup.c
epan/dissectors/packet-jabber.c
epan/dissectors/packet-jmirror.c
epan/dissectors/packet-jpeg.c
epan/dissectors/packet-juniper.c
epan/dissectors/packet-k12.c
epan/dissectors/packet-kdp.c
epan/dissectors/packet-kerberos.c
epan/dissectors/packet-kerberos4.c
epan/dissectors/packet-kingfisher.c
epan/dissectors/packet-kink.c
epan/dissectors/packet-kismet.c
epan/dissectors/packet-kpasswd.c
epan/dissectors/packet-l1-events.c
epan/dissectors/packet-l2tp.c
epan/dissectors/packet-lapb.c
epan/dissectors/packet-lapbether.c
epan/dissectors/packet-lapd.c
epan/dissectors/packet-lapdm.c
epan/dissectors/packet-laplink.c
epan/dissectors/packet-ldap.c
epan/dissectors/packet-ldp.c
epan/dissectors/packet-ldss.c
epan/dissectors/packet-lge_monitor.c
epan/dissectors/packet-linx.c
epan/dissectors/packet-llc.c
epan/dissectors/packet-lldp.c
epan/dissectors/packet-llt.c
epan/dissectors/packet-lmi.c
epan/dissectors/packet-lmp.c
epan/dissectors/packet-loop.c
epan/dissectors/packet-lpd.c
epan/dissectors/packet-lsc.c
epan/dissectors/packet-ltp.c
epan/dissectors/packet-lwapp.c
epan/dissectors/packet-lwres.c
epan/dissectors/packet-m2pa.c
epan/dissectors/packet-m2tp.c
epan/dissectors/packet-m2ua.c
epan/dissectors/packet-m3ua.c
epan/dissectors/packet-maccontrol.c
epan/dissectors/packet-mactelnet.c
epan/dissectors/packet-manolito.c
epan/dissectors/packet-mbtcp.c
epan/dissectors/packet-mdshdr.c
epan/dissectors/packet-megaco.c
epan/dissectors/packet-memcache.c
epan/dissectors/packet-meta.c
epan/dissectors/packet-mgcp.c
epan/dissectors/packet-mikey.c
epan/dissectors/packet-mip.c
epan/dissectors/packet-mip6.c
epan/dissectors/packet-mongo.c
epan/dissectors/packet-mp2t.c
epan/dissectors/packet-mp4ves.c
epan/dissectors/packet-mpeg-pes.c
epan/dissectors/packet-mpeg1.c
epan/dissectors/packet-mpls-echo.c
epan/dissectors/packet-mpls.c
epan/dissectors/packet-mq.c
epan/dissectors/packet-mrp-msrp.c
epan/dissectors/packet-ms-mms.c
epan/dissectors/packet-msdp.c
epan/dissectors/packet-msn-messenger.c
epan/dissectors/packet-msnlb.c
epan/dissectors/packet-msproxy.c
epan/dissectors/packet-mstp.c
epan/dissectors/packet-mtp2.c
epan/dissectors/packet-mtp3.c
epan/dissectors/packet-mtp3mg.c
epan/dissectors/packet-mysql.c
epan/dissectors/packet-nasdaq-soup.c
epan/dissectors/packet-nat-pmp.c
epan/dissectors/packet-nbap.c
epan/dissectors/packet-nbipx.c
epan/dissectors/packet-nbns.c
epan/dissectors/packet-ncp.c
epan/dissectors/packet-ncs.c
epan/dissectors/packet-ndmp.c
epan/dissectors/packet-ndp.c
epan/dissectors/packet-ndps.c
epan/dissectors/packet-netbios.c
epan/dissectors/packet-netdump.c
epan/dissectors/packet-netflow.c
epan/dissectors/packet-netmon-802_11.c
epan/dissectors/packet-netperfmeter.c
epan/dissectors/packet-netsync.c
epan/dissectors/packet-nettl.c
epan/dissectors/packet-newmail.c
epan/dissectors/packet-nfs.c
epan/dissectors/packet-nhrp.c
epan/dissectors/packet-nlsp.c
epan/dissectors/packet-nntp.c
epan/dissectors/packet-nsip.c
epan/dissectors/packet-nsrp.c
epan/dissectors/packet-nstrace.c
epan/dissectors/packet-nt-tpcp.c
epan/dissectors/packet-ntp.c
epan/dissectors/packet-null.c
epan/dissectors/packet-oicq.c
epan/dissectors/packet-olsr.c
epan/dissectors/packet-omapi.c
epan/dissectors/packet-omron-fins.c
epan/dissectors/packet-opsi.c
epan/dissectors/packet-osi.c
epan/dissectors/packet-ositp.c
epan/dissectors/packet-ospf.c
epan/dissectors/packet-p7.c
epan/dissectors/packet-p_mul.c
epan/dissectors/packet-packetbb.c
epan/dissectors/packet-packetlogger.c
epan/dissectors/packet-pagp.c
epan/dissectors/packet-pcap.c
epan/dissectors/packet-pcep.c
epan/dissectors/packet-pcli.c
epan/dissectors/packet-pflog.c
epan/dissectors/packet-pgm.c
epan/dissectors/packet-pgsql.c
epan/dissectors/packet-pim.c
epan/dissectors/packet-pingpongprotocol.c
epan/dissectors/packet-pktc.c
epan/dissectors/packet-pnrp.c
epan/dissectors/packet-pop.c
epan/dissectors/packet-ppi.c
epan/dissectors/packet-ppp.c
epan/dissectors/packet-pppoe.c
epan/dissectors/packet-pptp.c
epan/dissectors/packet-prp.c
epan/dissectors/packet-ptp.c
epan/dissectors/packet-pvfs2.c
epan/dissectors/packet-pw-atm.c
epan/dissectors/packet-pw-cesopsn.c
epan/dissectors/packet-pw-eth.c
epan/dissectors/packet-pw-fr.c
epan/dissectors/packet-pw-hdlc.c
epan/dissectors/packet-pw-satop.c
epan/dissectors/packet-q931.c
epan/dissectors/packet-q932-ros.c
epan/dissectors/packet-q932.c
epan/dissectors/packet-q933.c
epan/dissectors/packet-qsig.c
epan/dissectors/packet-quake.c
epan/dissectors/packet-quake2.c
epan/dissectors/packet-quake3.c
epan/dissectors/packet-quakeworld.c
epan/dissectors/packet-radiotap.c
epan/dissectors/packet-radius.c
epan/dissectors/packet-ranap.c
epan/dissectors/packet-raw.c
epan/dissectors/packet-rdt.c
epan/dissectors/packet-redback.c
epan/dissectors/packet-reload-framing.c
epan/dissectors/packet-rfc2190.c
epan/dissectors/packet-rip.c
epan/dissectors/packet-ripng.c
epan/dissectors/packet-rlogin.c
epan/dissectors/packet-rmcp.c
epan/dissectors/packet-rmi.c
epan/dissectors/packet-rmp.c
epan/dissectors/packet-rmt-alc.c
epan/dissectors/packet-rnsap.c
epan/dissectors/packet-roofnet.c
epan/dissectors/packet-rpc.c
epan/dissectors/packet-rpcap.c
epan/dissectors/packet-rpl.c
epan/dissectors/packet-rsh.c
epan/dissectors/packet-rsl.c
epan/dissectors/packet-rsvp.c
epan/dissectors/packet-rsync.c
epan/dissectors/packet-rtmpt.c
epan/dissectors/packet-rtnet.c
epan/dissectors/packet-rtp-events.c
epan/dissectors/packet-rtp.c
epan/dissectors/packet-rtsp.c
epan/dissectors/packet-rua.c
epan/dissectors/packet-rudp.c
epan/dissectors/packet-rx.c
epan/dissectors/packet-s1ap.c
epan/dissectors/packet-s5066.c
epan/dissectors/packet-sabp.c
epan/dissectors/packet-sametime.c
epan/dissectors/packet-sap.c
epan/dissectors/packet-sasp.c
epan/dissectors/packet-sbus.c
epan/dissectors/packet-sccp.c
epan/dissectors/packet-sccpmg.c
epan/dissectors/packet-scop.c
epan/dissectors/packet-scriptingservice.c
epan/dissectors/packet-sctp.c
epan/dissectors/packet-sdlc.c
epan/dissectors/packet-sdp.c
epan/dissectors/packet-sebek.c
epan/dissectors/packet-sflow.c
epan/dissectors/packet-sigcomp.c
epan/dissectors/packet-simulcrypt.c
epan/dissectors/packet-sip.c
epan/dissectors/packet-sita.c
epan/dissectors/packet-skinny.c
epan/dissectors/packet-slimp3.c
epan/dissectors/packet-sll.c
epan/dissectors/packet-slowprotocols.c
epan/dissectors/packet-slsk.c
epan/dissectors/packet-smb.c
epan/dissectors/packet-smrse.c
epan/dissectors/packet-smtp.c
epan/dissectors/packet-sna.c
epan/dissectors/packet-snaeth.c
epan/dissectors/packet-sndcp.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-socketcan.c
epan/dissectors/packet-socks.c
epan/dissectors/packet-spp.c
epan/dissectors/packet-sqloracle.c
epan/dissectors/packet-srvloc.c
epan/dissectors/packet-sscop.c
epan/dissectors/packet-ssh.c
epan/dissectors/packet-ssl-utils.c
epan/dissectors/packet-stun.c
epan/dissectors/packet-sua.c
epan/dissectors/packet-sv.c
epan/dissectors/packet-symantec.c
epan/dissectors/packet-synergy.c
epan/dissectors/packet-synphasor.c
epan/dissectors/packet-syslog.c
epan/dissectors/packet-t38.c
epan/dissectors/packet-tacacs.c
epan/dissectors/packet-tapa.c
epan/dissectors/packet-tcap.c
epan/dissectors/packet-tcp.c
epan/dissectors/packet-tdmoe.c
epan/dissectors/packet-tds.c
epan/dissectors/packet-teamspeak2.c
epan/dissectors/packet-teimanagement.c
epan/dissectors/packet-telkonet.c
epan/dissectors/packet-telnet.c
epan/dissectors/packet-teredo.c
epan/dissectors/packet-tftp.c
epan/dissectors/packet-time.c
epan/dissectors/packet-tipc.c
epan/dissectors/packet-tivoconnect.c
epan/dissectors/packet-tnef.c
epan/dissectors/packet-tns.c
epan/dissectors/packet-tpkt.c
epan/dissectors/packet-tpncp.c
epan/dissectors/packet-tr.c
epan/dissectors/packet-trill.c
epan/dissectors/packet-tsp.c
epan/dissectors/packet-tte-pcf.c
epan/dissectors/packet-tzsp.c
epan/dissectors/packet-udld.c
epan/dissectors/packet-udp.c
epan/dissectors/packet-ulp.c
epan/dissectors/packet-uma.c
epan/dissectors/packet-usb-hid.c
epan/dissectors/packet-usb-hub.c
epan/dissectors/packet-usb-masstorage.c
epan/dissectors/packet-usb.c
epan/dissectors/packet-user_encap.c
epan/dissectors/packet-v5ua.c
epan/dissectors/packet-vicp.c
epan/dissectors/packet-vines.c
epan/dissectors/packet-vj.c
epan/dissectors/packet-vmlab.c
epan/dissectors/packet-vnc.c
epan/dissectors/packet-vrrp.c
epan/dissectors/packet-vtp.c
epan/dissectors/packet-wai.c
epan/dissectors/packet-wassp.c
epan/dissectors/packet-wccp.c
epan/dissectors/packet-wcp.c
epan/dissectors/packet-wfleet-hdlc.c
epan/dissectors/packet-who.c
epan/dissectors/packet-winsrepl.c
epan/dissectors/packet-wlccp.c
epan/dissectors/packet-wol.c
epan/dissectors/packet-wow.c
epan/dissectors/packet-wsmp.c
epan/dissectors/packet-wsp.c
epan/dissectors/packet-wtls.c
epan/dissectors/packet-wtp.c
epan/dissectors/packet-x11.c
epan/dissectors/packet-x25.c
epan/dissectors/packet-x29.c
epan/dissectors/packet-x2ap.c
epan/dissectors/packet-x411.c
epan/dissectors/packet-x509ce.c
epan/dissectors/packet-xdmcp.c
epan/dissectors/packet-xml.c
epan/dissectors/packet-xot.c
epan/dissectors/packet-xtp.c
epan/dissectors/packet-xyplex.c
epan/dissectors/packet-zbee-aps.c
epan/dissectors/packet-zbee-zcl.c
epan/dissectors/packet-zbee-zdp.c
epan/dissectors/packet-zebra.c
epan/dissectors/packet-zep.c
epan/libwireshark.def
epan/next_tvb.c
epan/next_tvb.h
epan/packet.c
epan/packet.h
epan/packet_info.h
epan/wslua/wslua_pinfo.c
epan/wslua/wslua_proto.c
gtk/decode_as_dlg.c
plugins/asn1/packet-asn1.c
plugins/docsis/packet-bintrngreq.c
plugins/docsis/packet-bpkmattr.c
plugins/docsis/packet-bpkmreq.c
plugins/docsis/packet-bpkmrsp.c
plugins/docsis/packet-cmctrlreq.c
plugins/docsis/packet-cmctrlrsp.c
plugins/docsis/packet-dbcack.c
plugins/docsis/packet-dbcreq.c
plugins/docsis/packet-dbcrsp.c
plugins/docsis/packet-dccack.c
plugins/docsis/packet-dccreq.c
plugins/docsis/packet-dccrsp.c
plugins/docsis/packet-dcd.c
plugins/docsis/packet-docsis.c
plugins/docsis/packet-dpvreq.c
plugins/docsis/packet-dpvrsp.c
plugins/docsis/packet-dsaack.c
plugins/docsis/packet-dsareq.c
plugins/docsis/packet-dsarsp.c
plugins/docsis/packet-dscack.c
plugins/docsis/packet-dscreq.c
plugins/docsis/packet-dscrsp.c
plugins/docsis/packet-dsdreq.c
plugins/docsis/packet-dsdrsp.c
plugins/docsis/packet-intrngreq.c
plugins/docsis/packet-macmgmt.c
plugins/docsis/packet-map.c
plugins/docsis/packet-mdd.c
plugins/docsis/packet-regack.c
plugins/docsis/packet-regreq.c
plugins/docsis/packet-regreqmp.c
plugins/docsis/packet-regrsp.c
plugins/docsis/packet-regrspmp.c
plugins/docsis/packet-rngreq.c
plugins/docsis/packet-rngrsp.c
plugins/docsis/packet-sync.c
plugins/docsis/packet-tlv-cmctrl.c
plugins/docsis/packet-tlv.c
plugins/docsis/packet-type29ucd.c
plugins/docsis/packet-uccreq.c
plugins/docsis/packet-uccrsp.c
plugins/docsis/packet-ucd.c
plugins/docsis/packet-vendor.c
plugins/ethercat/packet-ams.c
plugins/ethercat/packet-ecatmb.c
plugins/ethercat/packet-ethercat-datagram.c
plugins/ethercat/packet-ethercat-frame.c
plugins/ethercat/packet-ioraw.c
plugins/ethercat/packet-nv.c
plugins/gryphon/packet-gryphon.c
plugins/interlink/packet-interlink.c
plugins/irda/packet-irda.c
plugins/irda/packet-sir.c
plugins/m2m/packet-m2m.c
plugins/opcua/opcua.c
plugins/profinet/packet-pn-mrp.c
plugins/profinet/packet-pn-rt.c
plugins/sercosiii/packet-sercosiii_1v1.c
plugins/tpg/packet-http.c
plugins/unistim/packet-unistim.c
plugins/wimax/packet-wmx.c
plugins/wimaxasncp/packet-wimaxasncp.c
tools/asn2wrs.py
tshark.c

index b7fc70d9e83673ee7c900199624b98672e56270d..aa1a2975d97edacbfa679e932df1c2c90bdb1f64 100644 (file)
@@ -287,17 +287,17 @@ TerminalType
                }
                if (ansi_map_sms_tele_id != -1)
                {
-                       dissector_try_port(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
+                       dissector_try_uint(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
                }
                else
                {
                        switch(ServiceIndicator){
                                case 1: /* CDMA OTASP Service */
                                case 3: /* CDMA OTAPA Service */
-                                       dissector_try_port(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+                                       dissector_try_uint(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
                                        break;
                                case 4: /* CDMA Position Determination Service */
-                                       dissector_try_port(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+                                       dissector_try_uint(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
                                        break;
                                default:
                                        break;
@@ -334,7 +334,7 @@ TerminalType
                ansi_map_sms_tele_id = tvb_get_ntohs(tvb,0);
                if ((ansi_map_sms_tele_id != -1)&&(SMS_BearerData_tvb !=NULL))
                {
-                   dissector_try_port(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
+                   dissector_try_uint(is637_tele_id_dissector_table, ansi_map_sms_tele_id, SMS_BearerData_tvb, g_pinfo, g_tree);
                }
        }
 
@@ -447,10 +447,10 @@ TerminalType
                        switch(ServiceIndicator){
                                case 1: /* CDMA OTASP Service */
                                case 3: /* CDMA OTAPA Service */
-                                       dissector_try_port(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+                                       dissector_try_uint(is683_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
                                        break;
                                case 4: /* CDMA Position Determination Service */
-                                       dissector_try_port(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
+                                       dissector_try_uint(is801_dissector_table, ansi_map_is_invoke ? 0 : 1, SMS_BearerData_tvb, g_pinfo, g_tree);
                                        break;
                                default:
                                        break;
index 8ff2eaf01f49eefdc63a33611a591b70f40ca261..d53a0c21a682c4baa0611cb7fa2aac6f923fe0f3 100644 (file)
@@ -107,12 +107,12 @@ static GHashTable* itu_sub_dissectors = NULL;
 
   extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(ansi_sub_dissectors,GUINT_TO_POINTER(ssn));
-    dissector_delete("sccp.ssn",ssn,tcap_handle);
+    dissector_delete_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) {
index 70d439473a1cf6a332704e2e3e5cdf898988380d..e7f3c7589418fa9b2b8e64baf0501be41ac97be4 100644 (file)
@@ -400,7 +400,7 @@ void proto_reg_handoff_cmp(void) {
                dissector_add_string("media_type", "application/x-pkixcmp-poll", cmp_tcp_style_http_handle);
 
                cmp_tcp_handle = new_create_dissector_handle(dissect_cmp_tcp, proto_cmp);
-               dissector_add("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
+               dissector_add_uint("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
 
                oid_add_from_string("Cryptlib-presence-check","1.3.6.1.4.1.3029.3.1.1");
                oid_add_from_string("Cryptlib-PKIBoot","1.3.6.1.4.1.3029.3.1.2");
@@ -419,17 +419,17 @@ void proto_reg_handoff_cmp(void) {
        /* change alternate TCP port if changed in the preferences */
        if (cmp_alternate_tcp_port != cmp_alternate_tcp_port_prev) {
                if (cmp_alternate_tcp_port_prev != 0)
-                       dissector_delete("tcp.port", cmp_alternate_tcp_port_prev, cmp_tcp_handle);
+                       dissector_delete_uint("tcp.port", cmp_alternate_tcp_port_prev, cmp_tcp_handle);
                if (cmp_alternate_tcp_port != 0)
-                       dissector_add("tcp.port", cmp_alternate_tcp_port, cmp_tcp_handle);
+                       dissector_add_uint("tcp.port", cmp_alternate_tcp_port, cmp_tcp_handle);
                cmp_alternate_tcp_port_prev = cmp_alternate_tcp_port;
        }
 
        /* change alternate HTTP port if changed in the preferences */
        if (cmp_alternate_http_port != cmp_alternate_http_port_prev) {
                if (cmp_alternate_http_port_prev != 0) {
-                       dissector_delete("tcp.port", cmp_alternate_http_port_prev, NULL);
-                       dissector_delete("http.port", cmp_alternate_http_port_prev, NULL);
+                       dissector_delete_uint("tcp.port", cmp_alternate_http_port_prev, NULL);
+                       dissector_delete_uint("http.port", cmp_alternate_http_port_prev, NULL);
                }
                if (cmp_alternate_http_port != 0)
                        http_dissector_add( cmp_alternate_http_port, cmp_http_handle);
@@ -439,8 +439,8 @@ void proto_reg_handoff_cmp(void) {
        /* change alternate TCP-style-HTTP port if changed in the preferences */
        if (cmp_alternate_tcp_style_http_port != cmp_alternate_tcp_style_http_port_prev) {
                if (cmp_alternate_tcp_style_http_port_prev != 0) {
-                       dissector_delete("tcp.port", cmp_alternate_tcp_style_http_port_prev, NULL);
-                       dissector_delete("http.port", cmp_alternate_tcp_style_http_port_prev, NULL);
+                       dissector_delete_uint("tcp.port", cmp_alternate_tcp_style_http_port_prev, NULL);
+                       dissector_delete_uint("http.port", cmp_alternate_tcp_style_http_port_prev, NULL);
                }
                if (cmp_alternate_tcp_style_http_port != 0)
                        http_dissector_add( cmp_alternate_tcp_style_http_port, cmp_tcp_style_http_handle);
index 7ae880a79fe18e537486802cd9ceb68db461b3ce..05e403af77f78bb5465e8169b1aa144b7a931936 100644 (file)
@@ -162,12 +162,12 @@ prefs_register_dap(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dap_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_dap_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_dap_tcp_port, tpkt_handle);
 
 }
index 5fa45749333d921646606caecd4353fb556ccdb0..9d29e2d6d5802183540ae6ca6a78b3e3e1cf6515 100644 (file)
@@ -269,12 +269,12 @@ prefs_register_disp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_disp_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_disp_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_disp_tcp_port, tpkt_handle);
 
 }
index 5ccc260bccd884da6dd6d80ef499fc892a52a10b..7ade3638bc4e71fdefac3c74dd8010174555d340 100644 (file)
@@ -324,12 +324,12 @@ prefs_register_dop(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dop_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", tcp_port, tpkt_handle);
 
 }
index ead56459480d3cff21e7c60c3e7a685bbbd1d851..91333d572ac35aa6a4f876f60b6193f9966ec824 100644 (file)
@@ -331,12 +331,12 @@ prefs_register_dsp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_dsp_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_dsp_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_dsp_tcp_port, tpkt_handle);
 
 }
index bbce687b39e3f12fdf94ce02927f71fe3c3d7455..1d218e3e757e1065d1f2f6681a5d625f7156124a 100644 (file)
@@ -154,5 +154,5 @@ void proto_reg_handoff_goose(void) {
        dissector_handle_t goose_handle;
        goose_handle = find_dissector("goose");
        
-       dissector_add("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
+       dissector_add_uint("ethertype", ETHERTYPE_IEC61850_GOOSE, goose_handle);
 }
index 7b9ac29f3899512170d204a2023c0323e8ab712c..345d6b9d7898acfdced4282579daa7eecaa908c4 100644 (file)
@@ -287,7 +287,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY ForwardSM-Arg
 
@@ -296,7 +296,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
        if (!actx->value_ptr)
                return offset;
-       dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+       dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MO-ForwardSM-Arg
 
@@ -305,7 +305,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
        if (!actx->value_ptr)
                return offset;
-       dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+       dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MO-ForwardSM-Res
 
@@ -314,7 +314,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-Arg
 
@@ -323,7 +323,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
        if (!actx->value_ptr)
                return offset;
-       dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+       dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-Res
 
@@ -332,7 +332,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-VGCS-Arg
 
@@ -341,7 +341,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY MT-ForwardSM-VGCS-Res
 
@@ -350,7 +350,7 @@ actx->pinfo->p2p_dir = P2P_DIR_RECV;
 
         if (!actx->value_ptr)
                 return offset;
-        dissector_try_port(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
+        dissector_try_uint(sms_dissector_table, 0, actx->value_ptr, actx->pinfo, top_tree);
 
 #.FN_BODY SS-Status VAL_PTR = &parameter_tvb
 
index 23ea813fd7dc65305a7e5d0434bb5fdf04b7a94e..e2b7cc0f6570855a853fd699cace3feb2eeecce3 100644 (file)
@@ -597,7 +597,7 @@ NonStandardIdentifier/object  FN_VARIANT = _str  VAL_PTR = &nsiOID
                        nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
                        break;
                case 1 :  /* h221NonStandard */
-                       nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+                       nsp_handle = dissector_get_uint_handle(nsp_h221_dissector_table, h221NonStandard);
                        break;
                default :
                        nsp_handle = NULL;
index 50ffa089e824768d36c2f2982720d4ac994910a5..48c8c48f634eabdbca9d63ad2d41d09b58d249e3 100644 (file)
@@ -298,8 +298,8 @@ proto_reg_handoff_h225(void)
 
        if (!h225_prefs_initialized) {
                h225ras_handle=find_dissector("h225.ras");
-               dissector_add("udp.port", UDP_PORT_RAS1, h225ras_handle);
-               dissector_add("udp.port", UDP_PORT_RAS2, h225ras_handle);
+               dissector_add_uint("udp.port", UDP_PORT_RAS1, h225ras_handle);
+               dissector_add_uint("udp.port", UDP_PORT_RAS2, h225ras_handle);
 
                h245_handle = find_dissector("h245");
                h245dg_handle = find_dissector("h245dg");
index c103e0b320bc1351916e9f4e0f710897ed1801c5..11c9f54f7f923c4abd77cd3d54ac6b8fc9dae8bc 100644 (file)
@@ -940,7 +940,7 @@ NonStandardIdentifier/object  FN_VARIANT = _str  VAL_PTR = &nsiOID
                        nsp_handle = dissector_get_string_handle(nsp_object_dissector_table, nsiOID);
                        break;
                case 1 :  /* h221NonStandard */
-                       nsp_handle = dissector_get_port_handle(nsp_h221_dissector_table, h221NonStandard);
+                       nsp_handle = dissector_get_uint_handle(nsp_h221_dissector_table, h221NonStandard);
                        break;
                default :
                        nsp_handle = NULL;
index b41f8ad2ec69308aab979d3b36cec67cae8c7db5..14588f3618a0ab1354de5e7b0655acb4540d65a0 100644 (file)
@@ -1548,26 +1548,26 @@ void proto_reg_handoff_h248(void) {
     if (!initialized) {
         h248_handle = find_dissector("h248");
         h248_tpkt_handle = find_dissector("h248.tpkt");
-        dissector_add("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
+        dissector_add_uint("mtp3.service_indicator", GATEWAY_CONTROL_PROTOCOL_USER_ID, h248_handle);
         h248_term_handle = find_dissector("h248term");
         initialized = TRUE;
     } else {
         if (udp_port != 0)
-            dissector_delete("udp.port", udp_port, h248_handle);
+            dissector_delete_uint("udp.port", udp_port, h248_handle);
 
         if (tcp_port != 0)
-            dissector_delete("tcp.port", tcp_port, h248_tpkt_handle);
+            dissector_delete_uint("tcp.port", tcp_port, h248_tpkt_handle);
     }
 
     udp_port = global_udp_port;
     tcp_port = global_tcp_port;
 
     if (udp_port != 0) {
-        dissector_add("udp.port", udp_port, h248_handle);
+        dissector_add_uint("udp.port", udp_port, h248_handle);
     }
 
     if (tcp_port != 0) {
-        dissector_add("tcp.port", tcp_port, h248_tpkt_handle);
+        dissector_add_uint("tcp.port", tcp_port, h248_tpkt_handle);
     }
 }
 
index 241e7c8fb515962dd54604b1de2a00ca0f67a483..ded2415430adbc23db31148a242d14badc13faf4 100644 (file)
@@ -289,12 +289,12 @@ proto_reg_handoff_h450(void)
   h450_arg_handle = new_create_dissector_handle(dissect_h450_arg, proto_h450);
   h450_res_handle = new_create_dissector_handle(dissect_h450_res, proto_h450);
   for (i=0; i<(int)array_length(h450_op_tab); i++) {
-    dissector_add("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
-    dissector_add("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
+    dissector_add_uint("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
+    dissector_add_uint("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
   }
   h450_err_handle = new_create_dissector_handle(dissect_h450_err, proto_h450);
   for (i=0; i<(int)array_length(h450_err_tab); i++) {
-    dissector_add("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
+    dissector_add_uint("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
   }
 
 }
index 39ca317a57ea9f193ed66bc00e6ac81fcc70f822..55e337ae2a305a7093976079afc822dfd273a1d6 100644 (file)
@@ -145,15 +145,15 @@ void proto_reg_handoff_h501(void)
     h501_tcp_handle = new_create_dissector_handle(dissect_h501_tcp, proto_h501);
     h501_prefs_initialized = TRUE;
   } else {
-    dissector_delete("udp.port", saved_h501_udp_port, h501_udp_handle);
-    dissector_delete("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
+    dissector_delete_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
+    dissector_delete_uint("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
   }
 
   /* Set our port number for future use */
   saved_h501_udp_port = h501_udp_port;
-  dissector_add("udp.port", saved_h501_udp_port, h501_udp_handle);
+  dissector_add_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
   saved_h501_tcp_port = h501_tcp_port;
-  dissector_add("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
+  dissector_add_uint("tcp.port", saved_h501_tcp_port, h501_tcp_handle);
 
 }
 
index a8662e6a0526b2abeeff4ed94ef651486a6c1ac2..18639af3c5de079ef12b8441614c85acec20c99a 100644 (file)
@@ -85,12 +85,12 @@ void proto_reg_handoff_hnbap(void);
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 #if 0
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -114,17 +114,17 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(hnbap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -192,14 +192,14 @@ proto_reg_handoff_hnbap(void)
 
         if (!initialized) {
                 hnbap_handle = find_dissector("hnbap");
-                dissector_add("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle);
+                dissector_add_uint("sctp.ppi", HNBAP_PAYLOAD_PROTOCOL_ID, hnbap_handle);
                 initialized = TRUE;
 #include "packet-hnbap-dis-tab.c"
 
         } else {
-                dissector_delete("sctp.port", sctp_port, hnbap_handle);
+                dissector_delete_uint("sctp.port", sctp_port, hnbap_handle);
         }
         /* Set our port number for future use */
         sctp_port = global_sctp_port;
-        dissector_add("sctp.port", sctp_port, hnbap_handle);
+        dissector_add_uint("sctp.port", sctp_port, hnbap_handle);
 }
index 5ca8a8bddef2ffc179767197859a9d447212ab10..877c1559b5c96f79d001917a54c25a3b08333b70 100644 (file)
@@ -378,12 +378,12 @@ prefs_register_idmp(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if(idmp_handle)
-    dissector_delete("tcp.port", tcp_port, idmp_handle);
+    dissector_delete_uint("tcp.port", tcp_port, idmp_handle);
 
   /* Set our port number for future use */
   tcp_port = global_idmp_tcp_port;
 
   if((tcp_port > 0) && idmp_handle)
-    dissector_add("tcp.port", global_idmp_tcp_port, idmp_handle);
+    dissector_add_uint("tcp.port", global_idmp_tcp_port, idmp_handle);
 
 }
index d2781df976436f58c4672630b766f9926a71a52d..b82ce9230a750cea0d926490fa86ca9c9eb817ca 100644 (file)
@@ -1639,9 +1639,9 @@ proto_reg_handoff_kerberos(void)
     kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp,
        proto_kerberos);
        */
-    dissector_add("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
+    dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
        /*
-    dissector_add("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
+    dissector_add_uint("tcp.port", TCP_PORT_KERBEROS, kerberos_handle_tcp);
        */
     register_dcerpc_auth_subdissector(DCE_C_AUTHN_LEVEL_PKT_INTEGRITY,
                                      DCE_C_RPC_AUTHN_PROTOCOL_GSS_KERBEROS,
index a55186f42e1eb81cd4ca625aa97ac9b0eb16f4bb..b4fec9b1131b213881019d2f974199874ba04684 100644 (file)
@@ -1745,7 +1745,7 @@ this_was_not_normal_ldap:
          guint32 old_start_tls_frame;
 
          /* temporarily dissect this port as SSL */
-         dissector_delete("tcp.port", tcp_port, ldap_handle);
+         dissector_delete_uint("tcp.port", tcp_port, ldap_handle);
          ssl_dissector_add(tcp_port, "ldap", TRUE);
 
          old_start_tls_frame = ldap_info->start_tls_frame;
@@ -1758,7 +1758,7 @@ this_was_not_normal_ldap:
          ssl_dissector_delete(tcp_port, "ldap", TRUE);
 
          /* restore ldap as the dissector for this port */
-         dissector_add("tcp.port", tcp_port, ldap_handle);
+         dissector_add_uint("tcp.port", tcp_port, ldap_handle);
 
          /* we are done */
          return;
@@ -2130,10 +2130,10 @@ proto_reg_handoff_ldap(void)
        dissector_handle_t cldap_handle;
        ldap_handle = find_dissector("ldap");
 
-       dissector_add("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
 
        cldap_handle = create_dissector_handle(dissect_mscldap, proto_cldap);
-       dissector_add("udp.port", UDP_PORT_CLDAP, cldap_handle);
+       dissector_add_uint("udp.port", UDP_PORT_CLDAP, cldap_handle);
 
        gssapi_handle = find_dissector("gssapi");
        gssapi_wrap_handle = find_dissector("gssapi_verf");
@@ -2205,13 +2205,13 @@ prefs_register_ldap(void)
 
   if(tcp_port != global_ldap_tcp_port) {
     if(tcp_port)
-      dissector_delete("tcp.port", tcp_port, ldap_handle);
+      dissector_delete_uint("tcp.port", tcp_port, ldap_handle);
 
     /* Set our port number for future use */
     tcp_port = global_ldap_tcp_port;
 
     if(tcp_port)
-      dissector_add("tcp.port", tcp_port, ldap_handle);
+      dissector_add_uint("tcp.port", tcp_port, ldap_handle);
 
   }
 
index c83c5678bec9bcec909885270c1118f858d6fae9..0f7b93795f077d42444b18934d8963d585d56670 100644 (file)
@@ -708,6 +708,6 @@ proto_reg_handoff_mpeg_pes(void)
 {
        dissector_handle_t mpeg_handle = find_dissector("mpeg");
 
-       dissector_add("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle);
+       dissector_add_uint("wtap_encap", WTAP_ENCAP_MPEG, mpeg_handle);
        heur_dissector_add("mpeg", dissect_mpeg_pes, proto_mpeg_pes);
 }
index 1bd8f57060833a642fa1ec4d8a8ba40645039821..f8f761b794b6f7a32895dc170fabf83524285a36 100644 (file)
@@ -84,12 +84,12 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(nbap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(nbap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -178,7 +178,7 @@ proto_reg_handoff_nbap(void)
        dissector_handle_t nbap_handle;
 
        nbap_handle = find_dissector("nbap");
-       dissector_add("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
+       dissector_add_uint("sctp.ppi", NBAP_PAYLOAD_PROTOCOL_ID, nbap_handle);
        dissector_add_handle("sctp.port", nbap_handle);  /* for "decode-as" */
 
 #include "packet-nbap-dis-tab.c"
index 8f712769b7cc00f03032f4ebce69869199f6bb38..2266337d70c8323b8854ff2bc2e0bed50e035629 100644 (file)
@@ -147,12 +147,12 @@ prefs_register_p7(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_p7_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", global_p7_tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", global_p7_tcp_port, tpkt_handle);
 
 }
index 91252424d9df8c0e82df6aa2e6a86baa810ee07d..791558c49c80e09166211af463471472c48f75ad 100644 (file)
@@ -97,32 +97,32 @@ static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(pcap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(pcap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -145,14 +145,14 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void range_delete_callback(guint32 ssn)
 {
     if ( ssn ) {
-        dissector_delete("sccp.ssn", ssn, pcap_handle);
+        dissector_delete_uint("sccp.ssn", ssn, pcap_handle);
     }
 }
 
 static void range_add_callback(guint32 ssn)
 {
     if (ssn) {
-        dissector_add("sccp.ssn", ssn, pcap_handle);
+        dissector_add_uint("sccp.ssn", ssn, pcap_handle);
     }
 }
 
index 66e8d84ca05069fb450216688afcce6e4ce73d51..67340a0e4e1ac3d2d83068e5cfbcc489bac9e025 100644 (file)
@@ -324,9 +324,9 @@ void proto_reg_handoff_q932(void) {
 
   q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932);
   /* Facility */
-  dissector_add("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); 
+  dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle); 
   /* Notification indicator */
-  dissector_add("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); 
+  dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_NOTIFICATION_INDICATOR, q932_ie_handle); 
 
   q932_ros_handle = find_dissector("q932.ros");
 }
index 580eb6a8e74f0dc243627760839bec433a4a98ae..26be9e4182e137e69cb3ff8cbb4a5a5fa391ebe5 100644 (file)
@@ -685,8 +685,8 @@ void proto_reg_handoff_qsig(void) {
   qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
   qsig_res_handle = new_create_dissector_handle(dissect_qsig_res, proto_qsig);
   for (i=0; i<(int)array_length(qsig_op_tab); i++) {
-    dissector_add("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
-    dissector_add("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
+    dissector_add_uint("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
+    dissector_add_uint("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
     key = qsig_op_tab[i].opcode;
     oid = g_hash_table_lookup(qsig_opcode2oid_hashtable, &key);
     if (oid) {
@@ -696,16 +696,16 @@ void proto_reg_handoff_qsig(void) {
   }
   qsig_err_handle = new_create_dissector_handle(dissect_qsig_err, proto_qsig);
   for (i=0; i<(int)array_length(qsig_err_tab); i++) {
-    dissector_add("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
+    dissector_add_uint("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
   }
 
   qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
   /* QSIG-TC - Transit counter */
-  dissector_add("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
+  dissector_add_uint("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
 
   qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
   /* SSIG-BC - Party category */
-  dissector_add("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
+  dissector_add_uint("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
 
   /* RFC 3204, 3.2 QSIG Media Type */
   dissector_add_string("media_type", "application/qsig", q931_handle);
index b1302e553db5b6cb1d3f5052f62269ec96b40232..1053cae3a53b2524808a8cb08e853bd476acd176 100644 (file)
@@ -151,16 +151,16 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
          case id_RelocationPreparation:
                  if((ProtocolIE_ID == id_Source_ToTarget_TransparentContainer)||(ProtocolIE_ID == id_Target_ToSource_TransparentContainer)){
                          key = SPECIAL | ProtocolIE_ID;
-                         ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+                         ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
                          break;
                  }
                  /* Fall trough */
          default:
                  /* no special handling */
-                 ret = (dissector_try_port_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+                 ret = (dissector_try_uint_new(ranap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
                  if (ret == 0) {
                          key = pdu_type | ProtocolIE_ID;
-                         ret = (dissector_try_port_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+                         ret = (dissector_try_uint_new(ranap_ies_dissector_table, key, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
                  }
                  break;
   }
@@ -169,41 +169,41 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
 
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   pdu_type = IMSG;
-  return (dissector_try_port_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
   pdu_type = 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
   pdu_type = SOUT;
-  return (dissector_try_port_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
   pdu_type = 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(ranap_proc_out_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -349,10 +349,10 @@ proto_reg_handoff_ranap(void)
                initialized = TRUE;
 #include "packet-ranap-dis-tab.c"
        } else {
-               dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
+               dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle);
        }
 
-       dissector_add("sccp.ssn", global_ranap_sccp_ssn, ranap_handle);
+       dissector_add_uint("sccp.ssn", global_ranap_sccp_ssn, ranap_handle);
        local_ranap_sccp_ssn = global_ranap_sccp_ssn;
        /* Add heuristic dissector
        * Perhaps we want a preference whether the heuristic dissector
index ff9d5b698d21cd93078c1483bb15e7cc4e143f4f..d7b24d4ea8960d9971f774689e221576d384b35f 100644 (file)
@@ -211,7 +211,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 %(DEFAULT_BODY)s
 
        if (nas_pdu_tvb)
-               dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
+               dissector_try_uint(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
 #.END
 
 #.FN_BODY RRC-Container VAL_PTR = &rrc_message_tvb
@@ -258,7 +258,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
 
 %(DEFAULT_BODY)s
        if (l3_info_tvb)
-               dissector_try_port(nas_pdu_dissector_table, 0x1, l3_info_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
+               dissector_try_uint(nas_pdu_dissector_table, 0x1, l3_info_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
 #.END
 
 # following construction is not supported by asn2wrs
index 43507f36d6aa91d0e4db7c4f01aea9187a4b4cd1..ee34f4f5e6c8237490d653954d73ac49c4b64b4a 100644 (file)
@@ -87,12 +87,12 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(rnsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(rnsap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(rnsap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(rnsap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -173,7 +173,7 @@ proto_reg_handoff_rnsap(void)
        rnsap_handle = find_dissector("rnsap");
        rrc_dl_dcch_handle = find_dissector("rrc.dl.dcch");
 
-       dissector_add("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
+       dissector_add_uint("sccp.ssn", SCCP_SSN_RNSAP, rnsap_handle);
        /* Add heuristic dissector
         * Perhaps we want a preference whether the heuristic dissector
         * is or isn't enabled
index caa7729cfb0332ab67d62b8010db9e5dcf124e40..9ec5a788cd7db9198053d820f7dbe9b87c4a3daa 100644 (file)
@@ -12,7 +12,7 @@
   actx->rose_ctx->d.pdu = 3;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->err_local_dissector_table) {
-    err_handle = dissector_get_port_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
+    err_handle = dissector_get_uint_handle(actx->rose_ctx->err_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->err_global_dissector_table) {
     err_handle = dissector_get_string_handle(actx->rose_ctx->err_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
index aa24364585dddfcb86ac6292646d6aa63a8b6161..8c663d9b7b387a0516f8f950c3a82e2d1f4be0a3 100644 (file)
@@ -13,7 +13,7 @@
   actx->rose_ctx->d.pdu = 1;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->arg_local_dissector_table) {
-    arg_handle = dissector_get_port_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
+    arg_handle = dissector_get_uint_handle(actx->rose_ctx->arg_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->arg_global_dissector_table) {
     arg_handle = dissector_get_string_handle(actx->rose_ctx->arg_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
index 4f85d0c419681fd48dbcdcd9ae69b7c999b311f7..5b0a4cc8f9b5c0eb369b5deb3f2e390d5e33662a 100644 (file)
@@ -13,7 +13,7 @@
   actx->rose_ctx->d.pdu = 2;
 
   if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) {
-    res_handle = dissector_get_port_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
+    res_handle = dissector_get_uint_handle(actx->rose_ctx->res_local_dissector_table, actx->rose_ctx->d.code_local);
   } else if ((actx->rose_ctx->d.code == 1) && actx->rose_ctx->res_global_dissector_table) {
     res_handle = dissector_get_string_handle(actx->rose_ctx->res_global_dissector_table, actx->rose_ctx->d.code_global);
   } else {
index 2826438241681900dd084191b67c7a5f015a239d..bda78611a64513dd57ece2d3bd30e48da6e2aeee 100644 (file)
@@ -89,27 +89,27 @@ void proto_reg_handoff_rua(void);
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint_new(rua_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree, FALSE)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -179,14 +179,14 @@ proto_reg_handoff_rua(void)
         if (!initialized) {
                 rua_handle = find_dissector("rua");
                 ranap_handle = find_dissector("ranap");
-                dissector_add("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle);
+                dissector_add_uint("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle);
                 initialized = TRUE;
 #include "packet-rua-dis-tab.c"
 
         } else {
-                dissector_delete("sctp.port", sctp_port, rua_handle);
+                dissector_delete_uint("sctp.port", sctp_port, rua_handle);
         }
         /* Set our port number for future use */
         sctp_port = global_sctp_port;
-        dissector_add("sctp.port", sctp_port, rua_handle);
+        dissector_add_uint("sctp.port", sctp_port, rua_handle);
 }
index f6ce7e21bb2f6d8c5d0889f35638ce1e7c82ab96..cff5f3fa76dedbc01299140e28312fc5480f97e3 100644 (file)
@@ -123,38 +123,38 @@ static int dissect_TargetBSS_ToSourceBSS_TransparentContainer_PDU(tvbuff_t *tvb,
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 /* Currently not used
 static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 */
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(s1ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 
@@ -187,18 +187,18 @@ proto_reg_handoff_s1ap(void)
        if (!Initialized) {
                nas_eps_handle = find_dissector("nas-eps");
                dissector_add_handle("sctp.port", s1ap_handle);   /* for "decode-as"  */
-               dissector_add("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
+               dissector_add_uint("sctp.ppi", S1AP_PAYLOAD_PROTOCOL_ID,   s1ap_handle);
                Initialized=TRUE;
 #include "packet-s1ap-dis-tab.c"
        } else {
                if (SctpPort != 0) {
-                       dissector_delete("sctp.port", SctpPort, s1ap_handle);
+                       dissector_delete_uint("sctp.port", SctpPort, s1ap_handle);
                }
        }
 
        SctpPort=gbl_s1apSctpPort;
        if (SctpPort != 0) {
-               dissector_add("sctp.port", SctpPort, s1ap_handle);
+               dissector_add_uint("sctp.port", SctpPort, s1ap_handle);
        }
 }
 
index b5ff7f74ce85510486874f29074adc2caf51d496..457cd9f55215b2c0d53c3e7404b926daed8d16be 100644 (file)
@@ -87,27 +87,27 @@ static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, p
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_extension_dissector_table, ProtocolExtensionID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(sabp_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(sabp_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static guint
@@ -215,9 +215,9 @@ proto_reg_handoff_sabp(void)
 
   sabp_handle = find_dissector("sabp");
   sabp_tcp_handle = find_dissector("sabp.tcp");
-  dissector_add("udp.port", 3452, sabp_handle);
-  dissector_add("tcp.port", 3452, sabp_tcp_handle);
-  dissector_add("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID,   sabp_handle);
+  dissector_add_uint("udp.port", 3452, sabp_handle);
+  dissector_add_uint("tcp.port", 3452, sabp_tcp_handle);
+  dissector_add_uint("sctp.ppi", SABP_PAYLOAD_PROTOCOL_ID,   sabp_handle);
 
 #include "packet-sabp-dis-tab.c"
 
index 9f507961fae008eb9b463fdc213ef1b9c3fbffef..f1cb536f9563e56d14e0eb0e9f19cc2636f9cef7 100644 (file)
@@ -183,6 +183,6 @@ void proto_reg_handoff_smrse(void) {
   dissector_handle_t smrse_handle;
 
   smrse_handle = new_create_dissector_handle(dissect_smrse, proto_smrse);
-  dissector_add("tcp.port",TCP_PORT_SMRSE, smrse_handle);
+  dissector_add_uint("tcp.port",TCP_PORT_SMRSE, smrse_handle);
 }
 
index 063aad603814046960f3cb5fce686ab27916214d..0a5971c9838375e0347aac9c3797b0703f56bdfa 100644 (file)
@@ -2254,17 +2254,17 @@ void proto_reg_handoff_snmp(void) {
 
        snmp_handle = find_dissector("snmp");
 
-       dissector_add("udp.port", UDP_PORT_SNMP, snmp_handle);
-       dissector_add("udp.port", UDP_PORT_SNMP_TRAP, snmp_handle);
-       dissector_add("udp.port", UDP_PORT_SNMP_PATROL, snmp_handle);
-       dissector_add("ethertype", ETHERTYPE_SNMP, snmp_handle);
-       dissector_add("ipx.socket", IPX_SOCKET_SNMP_AGENT, snmp_handle);
-       dissector_add("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
-       dissector_add("hpext.dxsap", HPEXT_SNMP, snmp_handle);
+       dissector_add_uint("udp.port", UDP_PORT_SNMP, snmp_handle);
+       dissector_add_uint("udp.port", UDP_PORT_SNMP_TRAP, snmp_handle);
+       dissector_add_uint("udp.port", UDP_PORT_SNMP_PATROL, snmp_handle);
+       dissector_add_uint("ethertype", ETHERTYPE_SNMP, snmp_handle);
+       dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_AGENT, snmp_handle);
+       dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
+       dissector_add_uint("hpext.dxsap", HPEXT_SNMP, snmp_handle);
 
        snmp_tcp_handle = create_dissector_handle(dissect_snmp_tcp, proto_snmp);
-       dissector_add("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
-       dissector_add("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
 
        data_handle = find_dissector("data");
 
@@ -2307,5 +2307,5 @@ proto_reg_handoff_smux(void)
        dissector_handle_t smux_handle;
 
        smux_handle = create_dissector_handle(dissect_smux, proto_smux);
-       dissector_add("tcp.port", TCP_PORT_SMUX, smux_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle);
 }
index 9ab6f16f00f10dd11dab2034f7a4a75993bc0ec7..e667f6dfcc90304c1b31099442d9079b949930b5 100644 (file)
@@ -331,5 +331,5 @@ void proto_reg_handoff_sv(void) {
        dissector_handle_t sv_handle;
        sv_handle = find_dissector("sv");
 
-       dissector_add("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
+       dissector_add_uint("ethertype", ETHERTYPE_IEC61850_SV, sv_handle);
 }
index 5ed1b73282d1602ef61aaf87bf6e4c939f4cc616..a08cffb4df8f8ce1913453bdac230262cf7e6259 100644 (file)
@@ -786,14 +786,14 @@ proto_reg_handoff_t38(void)
                t38_prefs_initialized = TRUE;
        }
        else {
-               dissector_delete("tcp.port", tcp_port, t38_tcp_handle);
-               dissector_delete("udp.port", udp_port, t38_udp_handle);
+               dissector_delete_uint("tcp.port", tcp_port, t38_tcp_handle);
+               dissector_delete_uint("udp.port", udp_port, t38_udp_handle);
        }
        tcp_port = global_t38_tcp_port;
        udp_port = global_t38_udp_port;
 
-       dissector_add("tcp.port", tcp_port, t38_tcp_handle);
-       dissector_add("udp.port", udp_port, t38_udp_handle);
+       dissector_add_uint("tcp.port", tcp_port, t38_tcp_handle);
+       dissector_add_uint("udp.port", udp_port, t38_udp_handle);
 
 }
 
index aa2b2dfc8a60a484f0cd0e4fcdfcee4b2dac56da..673cf092f5dc34d10507e6e4066d8246f611a8c0 100644 (file)
@@ -108,23 +108,23 @@ static void dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_t
 
 extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void add_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(itu_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
-    dissector_add("sccp.ssn",ssn,tcap_handle);
+    dissector_add_uint("sccp.ssn",ssn,tcap_handle);
 }
 
 extern void delete_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(ansi_sub_dissectors,GUINT_TO_POINTER(ssn));
     if (!get_itu_tcap_subdissector(ssn))
-      dissector_delete("sccp.ssn",ssn,tcap_handle);
+      dissector_delete_uint("sccp.ssn",ssn,tcap_handle);
 }
 extern void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissector _U_) {
     g_hash_table_remove(itu_sub_dissectors,GUINT_TO_POINTER(ssn));
     if (!get_ansi_tcap_subdissector(ssn))
-      dissector_delete("sccp.ssn", ssn,tcap_handle);
+      dissector_delete_uint("sccp.ssn", ssn,tcap_handle);
 }
 
 dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) {
@@ -400,14 +400,14 @@ proto_register_tcap(void)
 static void range_delete_callback(guint32 ssn)
 {
     if ( ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) {
-        dissector_delete("sccp.ssn", ssn, tcap_handle);
+        dissector_delete_uint("sccp.ssn", ssn, tcap_handle);
     }
 }
 
 static void range_add_callback(guint32 ssn)
 {
     if (ssn && !get_ansi_tcap_subdissector(ssn) && !get_itu_tcap_subdissector(ssn) ) {
-        dissector_add("sccp.ssn", ssn, tcap_handle);
+        dissector_add_uint("sccp.ssn", ssn, tcap_handle);
     }
 }
 
@@ -564,7 +564,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
                                  p_tcap_context->subdissector_present=TRUE;
                          } else {
                            /* Not found, so try to find a subdissector according to SSN */
-                           if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+                           if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
                              /* Found according to SSN */
                              p_tcap_context->subdissector_handle=subdissector_handle;
                              p_tcap_context->subdissector_present=TRUE;
@@ -610,7 +610,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
       } else {
                  /* Search if we can found the sub protocol according to the SSN table */
                  if ( (subdissector_handle
-                         = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+                         = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
                          /* Found according to SSN */
                          is_subdissector=TRUE;
                  } else {
@@ -621,7 +621,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
          } /* ACN */
        } else {
                /* There is no A.C.N for this transaction, so search in the SSN table */
-               if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_port))) {
+               if ( (subdissector_handle = get_itu_tcap_subdissector(actx->pinfo->match_uint))) {
                        /* Found according to SSN */
                        is_subdissector=TRUE;
                } else {
index a7988bb160ebae3cfee8f738411a62eb3c7f6509..cb3558f39f611315a1c226e557eab52579ccc00c 100644 (file)
@@ -146,11 +146,11 @@ proto_reg_handoff_ulp(void)
                rrlp_handle = find_dissector("rrlp");
                initialized = TRUE;
        } else {
-               dissector_delete("tcp.port", local_ulp_port, ulp_handle);
+               dissector_delete_uint("tcp.port", local_ulp_port, ulp_handle);
        }
 
        local_ulp_port = gbl_ulp_port;
-       dissector_add("tcp.port", gbl_ulp_port, ulp_handle);
+       dissector_add_uint("tcp.port", gbl_ulp_port, ulp_handle);
 
        /* application/oma-supl-ulp */
 
index 7fc87483dfe0fc806d528e01f09da7c0f9451cb0..730555f72e03d49d16034ff32970cdb1cf4b5fc6 100644 (file)
@@ -92,27 +92,27 @@ void proto_reg_handoff_x2ap(void);
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_extension_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_imsg_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_sout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static int dissect_UnsuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-  return (dissector_try_port(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
+  return (dissector_try_uint(x2ap_proc_uout_dissector_table, ProcedureCode, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
 }
 
 static void
@@ -197,18 +197,18 @@ proto_reg_handoff_x2ap(void)
        x2ap_handle = find_dissector("x2ap");
        if (!Initialized) {
                dissector_add_handle("sctp.port", x2ap_handle);  /* for "decode-as" */
-               dissector_add("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
+               dissector_add_uint("sctp.ppi", X2AP_PAYLOAD_PROTOCOL_ID, x2ap_handle);
                Initialized=TRUE;
 #include "packet-x2ap-dis-tab.c"
        } else {
                if (SctpPort != 0) {
-                       dissector_delete("sctp.port", SctpPort, x2ap_handle);
+                       dissector_delete_uint("sctp.port", SctpPort, x2ap_handle);
                }
        }
 
        SctpPort=gbl_x2apSctpPort;
        if (SctpPort != 0) {
-               dissector_add("sctp.port", SctpPort, x2ap_handle);
+               dissector_add_uint("sctp.port", SctpPort, x2ap_handle);
        }
 
 }
index 55a9d2421b03f9bce3d5e52f19dff24cfce343b2..e3739c0798af872ab99b37053b08b12ff0ccc418 100644 (file)
@@ -339,12 +339,12 @@ prefs_register_x411(void)
   /* de-register the old port */
   /* port 102 is registered by TPKT - don't undo this! */
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_delete("tcp.port", tcp_port, tpkt_handle);
+    dissector_delete_uint("tcp.port", tcp_port, tpkt_handle);
 
   /* Set our port number for future use */
   tcp_port = global_x411_tcp_port;
 
   if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle)
-    dissector_add("tcp.port", tcp_port, tpkt_handle);
+    dissector_add_uint("tcp.port", tcp_port, tpkt_handle);
 
 }
index 7382b40145a0d3e4460c2c17e7325340f8994e87..5e447acbfdeb25ef42c6d2d32a9bdcc49d9a5143 100644 (file)
@@ -535,7 +535,7 @@ MessageToken                                                B       "2.6.1.7.36"    "id-hat-forwarded-token"
 
        if(extension_id != -1) {
                proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_StandardExtension_vals, "standard-extension %%d")); 
-               if (dissector_try_port(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+               if (dissector_try_uint(x411_extension_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
                        offset = tvb_length(tvb);
                } else {
                        proto_item *item = NULL;
@@ -574,7 +574,7 @@ MessageToken                                                B       "2.6.1.7.36"    "id-hat-forwarded-token"
 #.FN_BODY ExtensionAttribute/extension-attribute-value
 
        proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_ExtensionAttributeType_vals, "extension-attribute-type %%d")); 
-       if (dissector_try_port(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+       if (dissector_try_uint(x411_extension_attribute_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
                offset =tvb_length(tvb);
        } else {
                proto_item *item = NULL;
@@ -1234,7 +1234,7 @@ MessageToken                                              B       "2.6.1.7.36"    "id-hat-forwarded-token"
 #.FN_BODY TokenData/value
 
        proto_item_append_text(tree, " (%%s)", val_to_str(extension_id, x411_TokenDataType_vals, "tokendata-type %%d")); 
-       if (dissector_try_port(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
+       if (dissector_try_uint(x411_tokendata_dissector_table, extension_id, tvb, actx->pinfo, tree)) {
                offset = tvb_length(tvb);
        } else {
                proto_item *item = NULL;
index 1d944177c2d2a35cc5e01a25d8f734d2b178f642..49392c98c66ea8c2a245710f1785c5a767eebd1e 100644 (file)
@@ -1063,12 +1063,12 @@ proto_reg_handoff_PROTOABBREV(void)
                  function (proto_reg_handoff).
                */
 
-               dissector_delete("tcp.port", currentPort, PROTOABBREV_handle);
+               dissector_delete_uint("tcp.port", currentPort, PROTOABBREV_handle);
        }
 
        currentPort = gPORT_PREF;
 
-       dissector_add("tcp.port", currentPort, PROTOABBREV_handle);
+       dissector_add_uint("tcp.port", currentPort, PROTOABBREV_handle);
 
 }
 
@@ -1088,7 +1088,7 @@ proto_reg_handoff_PROTOABBREV(void)
  */
        PROTOABBREV_handle = new_create_dissector_handle(dissect_PROTOABBREV,
                                                         proto_PROTOABBREV);
-       dissector_add("PARENT_SUBFIELD", ID_VALUE, PROTOABBREV_handle);
+       dissector_add_uint("PARENT_SUBFIELD", ID_VALUE, PROTOABBREV_handle);
 }
 #endif
 
@@ -3661,10 +3661,10 @@ example, stolen from packet-dns.c:
        mdns_udp_handle = create_dissector_handle(dissect_mdns_udp,
            proto_dns);
 
-       dissector_add("udp.port", UDP_PORT_DNS, dns_udp_handle);
-       dissector_add("tcp.port", TCP_PORT_DNS, dns_tcp_handle);
-       dissector_add("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
-       dissector_add("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
+       dissector_add_uint("udp.port", UDP_PORT_DNS, dns_udp_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_DNS, dns_tcp_handle);
+       dissector_add_uint("udp.port", UDP_PORT_MDNS, mdns_udp_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_MDNS, dns_tcp_handle);
 
 The dissect_dns_udp function does very little work and calls
 dissect_dns_common, while dissect_dns_tcp calls tcp_dissect_pdus with a
index 8158135cf26c516c6aa95f402efedb3b0817a9d0..4945f6210cabd9c67cf2b930d7eb97204ec54e2c 100644 (file)
@@ -205,7 +205,7 @@ proto_reg_handoff_PROTOABBREV(void)
         /* register as normal dissector for IP as well */
         PROTOABBREV_handle = new_create_dissector_handle(dissect_PROTOABBREV,
             proto_PROTOABBREV);
-        dissector_add("ip.proto", IP_PROTO_PROTOABBREV, PROTOABBREV_handle);
+        dissector_add_uint("ip.proto", IP_PROTO_PROTOABBREV, PROTOABBREV_handle);
         PROTOABBREV_inited = TRUE;
     }
 }
index 0d6cb8a901e237a34ee372ca1ad20716e2c53780..cfcf4b41eb062fecf25ae88f389d91624a1503d2 100644 (file)
@@ -76,7 +76,7 @@ CLASSES
      |  
      |  protocol_ids(self)
      |      defined a list of tuples containing three values. Each tuple is defining
-     |      the parameters of dissector_add(). This function MUST be defined when
+     |      the parameters of dissector_add_uint(). This function MUST be defined when
      |      implementing the dissector of a specific protocol.
      |  
      |  register_handoff(self)
index 90b969519c3c5749e15aa630ca4f0a82a9b524ab..14172651ca517a1a8fb2dde4bff4f9e0e7991334 100644 (file)
@@ -133,7 +133,7 @@ proto_reg_handoff_foo(void)
     static dissector_handle_t foo_handle;
 
     foo_handle = create_dissector_handle(dissect_foo, proto_foo);
-    dissector_add("udp.port", FOO_PORT, foo_handle);
+    dissector_add_uint("udp.port", FOO_PORT, foo_handle);
 }]]>
    </programlisting></example>
        <para>
index c315ffb9820edc5dce095145d72084a3ce4d8198..b347dab4f9275629c945edd7bb6b4f5ccbeac3c2 100644 (file)
@@ -342,9 +342,9 @@ void proto_reg_handoff_2dparityfec(void)
    }
 
    if (dissect_fec) {
-      dissector_add("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
+      dissector_add_uint("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
    } else {
-      dissector_delete("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
+      dissector_delete_uint("rtp.pt", fec_rtp_payload_type, handle_2dparityfec);
    }
 }
 
index 22778ba536cad0ba28897f978d62defaec2bd27f..2ff40f01abfe7ac303a592a6aa763d32ee3d4a4f 100644 (file)
@@ -791,10 +791,10 @@ proto_reg_handoff_njack(void)
        dissector_handle_t njack_handle;
 
        njack_handle = new_create_dissector_handle(dissect_njack_static, proto_njack);
-       dissector_add("udp.port", PORT_NJACK_PC, njack_handle);
-       /* dissector_add("tcp.port", PORT_NJACK_PC, njack_handle); */
-       dissector_add("udp.port", PORT_NJACK_SWITCH, njack_handle);
-       /* dissector_add("tcp.port", PORT_NJACK_SWITCH, njack_handle); */
+       dissector_add_uint("udp.port", PORT_NJACK_PC, njack_handle);
+       /* dissector_add_uint("tcp.port", PORT_NJACK_PC, njack_handle); */
+       dissector_add_uint("udp.port", PORT_NJACK_SWITCH, njack_handle);
+       /* dissector_add_uint("tcp.port", PORT_NJACK_SWITCH, njack_handle); */
 
         heur_dissector_add("udp", dissect_njack_heur, proto_njack);
         /* heur_dissector_add("tcp", dissect_njack_heur, proto_njack); */
index d758476648ab36501fed0123c754a958d1c1a435..58b559ca62bbe2f23f158e6b57b53972cd14af9d 100644 (file)
@@ -87,7 +87,7 @@ dissect_3com_xns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        } else {
                proto_tree_add_uint(subtree, hf_3com_xns_type_ethertype,
                    tvb, 0, 2, type);
-               if (!dissector_try_port(ethertype_subdissector_table,
+               if (!dissector_try_uint(ethertype_subdissector_table,
                    type, next_tvb, pinfo, tree))
                        call_dissector(data_handle, next_tvb, pinfo, tree);
        }
@@ -127,5 +127,5 @@ proto_reg_handoff_3com_xns(void)
        ethertype_subdissector_table = find_dissector_table("ethertype");
 
        our_xns_handle = create_dissector_handle(dissect_3com_xns, proto_3com_xns);
-       dissector_add("llc.dsap", 0x80, our_xns_handle);
+       dissector_add_uint("llc.dsap", 0x80, our_xns_handle);
 }
index 87018115eac56e8a2738f7d8ed398520723f1c6e..c0e0f35f5f0d063eb478a4b3740fbddb31923b31 100644 (file)
@@ -2148,5 +2148,5 @@ proto_reg_handoff_a11(void)
     dissector_handle_t a11_handle;
 
     a11_handle = find_dissector("a11");
-    dissector_add("udp.port", UDP_PORT_3GA11, a11_handle);
+    dissector_add_uint("udp.port", UDP_PORT_3GA11, a11_handle);
 }
index 842e7ef1a9e79998a011be1ec9c1cb6602bdd7f5..53e2b6fbf0f4899e81bf3cb9daf5a6649b256887 100644 (file)
@@ -826,7 +826,7 @@ void proto_reg_handoff_9P(void)
 
        ninep_handle = create_dissector_handle(dissect_9P, proto_9P);
 
-       dissector_add("tcp.port", NINEPORT, ninep_handle);
+       dissector_add_uint("tcp.port", NINEPORT, ninep_handle);
 }
 
 
index e44c3880bc5948a01dd15260f1227fccde49e965..e75b64e2787e9758a81190ff612c7b438d224ace 100644 (file)
@@ -598,8 +598,8 @@ static const value_string HI2Operations_IP_value_vals[] = {
 };
 
 static const ber_choice_t IP_value_choice[] = {
-  {   1, &hf_HI2Operations_iPBinaryAddress, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_4_16 },
-  {   2, &hf_HI2Operations_iPTextAddress, BER_CLASS_CON, 2, 0, dissect_HI2Operations_IA5String_SIZE_7_45 },
+  {   1, &hf_HI2Operations_iPBinaryAddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_4_16 },
+  {   2, &hf_HI2Operations_iPTextAddress, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IA5String_SIZE_7_45 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -631,9 +631,9 @@ dissect_HI2Operations_T_iP_assignment(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 
 static const ber_sequence_t IPAddress_sequence[] = {
-  { &hf_HI2Operations_iP_type, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_iP_type },
-  { &hf_HI2Operations_iP_value, BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_IP_value },
-  { &hf_HI2Operations_iP_assignment, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_iP_assignment },
+  { &hf_HI2Operations_iP_type, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_iP_type },
+  { &hf_HI2Operations_iP_value, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_IP_value },
+  { &hf_HI2Operations_iP_assignment, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_iP_assignment },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -656,11 +656,11 @@ static const value_string HI2Operations_Network_Element_Identifier_vals[] = {
 };
 
 static const ber_choice_t Network_Element_Identifier_choice[] = {
-  {   1, &hf_HI2Operations_e164_Format, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   2, &hf_HI2Operations_x25_Format, BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   3, &hf_HI2Operations_iP_Format, BER_CLASS_CON, 3, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   4, &hf_HI2Operations_dNS_Format, BER_CLASS_CON, 4, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   5, &hf_HI2Operations_iP_Address, BER_CLASS_CON, 5, 0, dissect_HI2Operations_IPAddress },
+  {   1, &hf_HI2Operations_e164_Format, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   2, &hf_HI2Operations_x25_Format, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   3, &hf_HI2Operations_iP_Format, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   4, &hf_HI2Operations_dNS_Format, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   5, &hf_HI2Operations_iP_Address, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IPAddress },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -675,8 +675,8 @@ dissect_HI2Operations_Network_Element_Identifier(gboolean implicit_tag _U_, tvbu
 
 
 static const ber_sequence_t Network_Identifier_sequence[] = {
-  { &hf_HI2Operations_operator_Identifier, BER_CLASS_CON, 0, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_5 },
-  { &hf_HI2Operations_network_Element_Identifier, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Network_Element_Identifier },
+  { &hf_HI2Operations_operator_Identifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_5 },
+  { &hf_HI2Operations_network_Element_Identifier, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Network_Element_Identifier },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -690,8 +690,8 @@ dissect_HI2Operations_Network_Identifier(gboolean implicit_tag _U_, tvbuff_t *tv
 
 
 static const ber_sequence_t CommunicationIdentifier_sequence[] = {
-  { &hf_HI2Operations_communication_Identity_Number, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_8 },
-  { &hf_HI2Operations_network_Identifier, BER_CLASS_CON, 1, 0, dissect_HI2Operations_Network_Identifier },
+  { &hf_HI2Operations_communication_Identity_Number, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_8 },
+  { &hf_HI2Operations_network_Identifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Network_Identifier },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -731,8 +731,8 @@ dissect_HI2Operations_T_winterSummerIndication(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t LocalTimeStamp_sequence[] = {
-  { &hf_HI2Operations_generalizedTime, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeneralizedTime },
-  { &hf_HI2Operations_winterSummerIndication, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_winterSummerIndication },
+  { &hf_HI2Operations_generalizedTime, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeneralizedTime },
+  { &hf_HI2Operations_winterSummerIndication, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_winterSummerIndication },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -761,8 +761,8 @@ static const value_string HI2Operations_TimeStamp_vals[] = {
 };
 
 static const ber_choice_t TimeStamp_choice[] = {
-  {   0, &hf_HI2Operations_localTime, BER_CLASS_CON, 0, 0, dissect_HI2Operations_LocalTimeStamp },
-  {   1, &hf_HI2Operations_utcTime, BER_CLASS_CON, 1, 0, dissect_HI2Operations_UTCTime },
+  {   0, &hf_HI2Operations_localTime, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LocalTimeStamp },
+  {   1, &hf_HI2Operations_utcTime, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -871,10 +871,10 @@ dissect_HI2Operations_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t T_ms_Loc_sequence[] = {
-  { &hf_HI2Operations_mcc   , BER_CLASS_CON, 1, 0, dissect_HI2Operations_INTEGER_0_1023 },
-  { &hf_HI2Operations_mnc   , BER_CLASS_CON, 2, 0, dissect_HI2Operations_INTEGER_0_16383 },
-  { &hf_HI2Operations_lai   , BER_CLASS_CON, 3, 0, dissect_HI2Operations_INTEGER_0_65535 },
-  { &hf_HI2Operations_ci    , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER },
+  { &hf_HI2Operations_mcc   , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_1023 },
+  { &hf_HI2Operations_mnc   , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_16383 },
+  { &hf_HI2Operations_lai   , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_65535 },
+  { &hf_HI2Operations_ci    , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -894,8 +894,8 @@ static const value_string HI2Operations_TetraLocation_vals[] = {
 };
 
 static const ber_choice_t TetraLocation_choice[] = {
-  {   1, &hf_HI2Operations_ms_Loc, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_ms_Loc },
-  {   2, &hf_HI2Operations_ls_Loc, BER_CLASS_CON, 2, 0, dissect_HI2Operations_INTEGER },
+  {   1, &hf_HI2Operations_ms_Loc, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_ms_Loc },
+  {   2, &hf_HI2Operations_ls_Loc, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -969,10 +969,10 @@ dissect_HI2Operations_INTEGER_0_359(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t T_geoCoordinates_sequence[] = {
-  { &hf_HI2Operations_latitude, BER_CLASS_CON, 1, 0, dissect_HI2Operations_PrintableString_SIZE_7_10 },
-  { &hf_HI2Operations_longitude, BER_CLASS_CON, 2, 0, dissect_HI2Operations_PrintableString_SIZE_8_11 },
-  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MapDatum },
-  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER_0_359 },
+  { &hf_HI2Operations_latitude, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_7_10 },
+  { &hf_HI2Operations_longitude, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_8_11 },
+  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum },
+  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_359 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1008,10 +1008,10 @@ dissect_HI2Operations_PrintableString_SIZE_7(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t T_utmCoordinates_sequence[] = {
-  { &hf_HI2Operations_utm_East, BER_CLASS_CON, 1, 0, dissect_HI2Operations_PrintableString_SIZE_10 },
-  { &hf_HI2Operations_utm_North, BER_CLASS_CON, 2, 0, dissect_HI2Operations_PrintableString_SIZE_7 },
-  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MapDatum },
-  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER_0_359 },
+  { &hf_HI2Operations_utm_East, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_10 },
+  { &hf_HI2Operations_utm_North, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_7 },
+  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum },
+  { &hf_HI2Operations_azimuth, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_359 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1036,8 +1036,8 @@ dissect_HI2Operations_PrintableString_SIZE_13(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t T_utmRefCoordinates_sequence[] = {
-  { &hf_HI2Operations_utmref_string, BER_CLASS_CON, 2, 0, dissect_HI2Operations_PrintableString_SIZE_13 },
-  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MapDatum },
+  { &hf_HI2Operations_utmref_string, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_13 },
+  { &hf_HI2Operations_mapDatum, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MapDatum },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1069,10 +1069,10 @@ static const value_string HI2Operations_GSMLocation_vals[] = {
 };
 
 static const ber_choice_t GSMLocation_choice[] = {
-  {   1, &hf_HI2Operations_geoCoordinates, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_geoCoordinates },
-  {   2, &hf_HI2Operations_utmCoordinates, BER_CLASS_CON, 2, 0, dissect_HI2Operations_T_utmCoordinates },
-  {   3, &hf_HI2Operations_utmRefCoordinates, BER_CLASS_CON, 3, 0, dissect_HI2Operations_T_utmRefCoordinates },
-  {   4, &hf_HI2Operations_wGS84Coordinates, BER_CLASS_CON, 4, 0, dissect_HI2Operations_OCTET_STRING },
+  {   1, &hf_HI2Operations_geoCoordinates, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_geoCoordinates },
+  {   2, &hf_HI2Operations_utmCoordinates, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_utmCoordinates },
+  {   3, &hf_HI2Operations_utmRefCoordinates, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_utmRefCoordinates },
+  {   4, &hf_HI2Operations_wGS84Coordinates, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1123,9 +1123,9 @@ dissect_HI2Operations_INTEGER_M8388608_8388607(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t GeographicalCoordinates_sequence[] = {
-  { &hf_HI2Operations_latitudeSign, BER_CLASS_CON, 0, 0, dissect_HI2Operations_T_latitudeSign },
-  { &hf_HI2Operations_latitude_01, BER_CLASS_CON, 1, 0, dissect_HI2Operations_INTEGER_0_8388607 },
-  { &hf_HI2Operations_longitude_01, BER_CLASS_CON, 2, 0, dissect_HI2Operations_INTEGER_M8388608_8388607 },
+  { &hf_HI2Operations_latitudeSign, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_latitudeSign },
+  { &hf_HI2Operations_latitude_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_8388607 },
+  { &hf_HI2Operations_longitude_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_M8388608_8388607 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1139,7 +1139,7 @@ dissect_HI2Operations_GeographicalCoordinates(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t GA_Point_sequence[] = {
-  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeographicalCoordinates },
+  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeographicalCoordinates },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1163,8 +1163,8 @@ dissect_HI2Operations_INTEGER_0_127(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t GA_PointWithUnCertainty_sequence[] = {
-  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeographicalCoordinates },
-  { &hf_HI2Operations_uncertaintyCode, BER_CLASS_CON, 1, 0, dissect_HI2Operations_INTEGER_0_127 },
+  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeographicalCoordinates },
+  { &hf_HI2Operations_uncertaintyCode, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_0_127 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1178,7 +1178,7 @@ dissect_HI2Operations_GA_PointWithUnCertainty(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t GA_Polygon_item_sequence[] = {
-  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, 0, dissect_HI2Operations_GeographicalCoordinates },
+  { &hf_HI2Operations_geographicalCoordinates, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GeographicalCoordinates },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1212,9 +1212,9 @@ static const value_string HI2Operations_UMTSLocation_vals[] = {
 };
 
 static const ber_choice_t UMTSLocation_choice[] = {
-  {   1, &hf_HI2Operations_point , BER_CLASS_CON, 1, 0, dissect_HI2Operations_GA_Point },
-  {   2, &hf_HI2Operations_pointWithUnCertainty, BER_CLASS_CON, 2, 0, dissect_HI2Operations_GA_PointWithUnCertainty },
-  {   3, &hf_HI2Operations_polygon, BER_CLASS_CON, 3, 0, dissect_HI2Operations_GA_Polygon },
+  {   1, &hf_HI2Operations_point , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GA_Point },
+  {   2, &hf_HI2Operations_pointWithUnCertainty, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GA_PointWithUnCertainty },
+  {   3, &hf_HI2Operations_polygon, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_GA_Polygon },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1239,14 +1239,14 @@ dissect_HI2Operations_OCTET_STRING_SIZE_7(gboolean implicit_tag _U_, tvbuff_t *t
 
 
 static const ber_sequence_t Location_sequence[] = {
-  { &hf_HI2Operations_e164_Number, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  { &hf_HI2Operations_globalCellID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_5_7 },
-  { &hf_HI2Operations_tetraLocation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TetraLocation },
-  { &hf_HI2Operations_rAI   , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
-  { &hf_HI2Operations_gsmLocation, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_GSMLocation },
-  { &hf_HI2Operations_umtsLocation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UMTSLocation },
-  { &hf_HI2Operations_sAI   , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_7 },
-  { &hf_HI2Operations_oldRAI, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
+  { &hf_HI2Operations_e164_Number, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  { &hf_HI2Operations_globalCellID, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_5_7 },
+  { &hf_HI2Operations_tetraLocation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TetraLocation },
+  { &hf_HI2Operations_rAI   , BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
+  { &hf_HI2Operations_gsmLocation, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_GSMLocation },
+  { &hf_HI2Operations_umtsLocation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UMTSLocation },
+  { &hf_HI2Operations_sAI   , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_7 },
+  { &hf_HI2Operations_oldRAI, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_6 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1315,9 +1315,9 @@ static const value_string HI2Operations_CallingPartyNumber_vals[] = {
 };
 
 static const ber_choice_t CallingPartyNumber_choice[] = {
-  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   2, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   3, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 3, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   2, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   3, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1339,9 +1339,9 @@ static const value_string HI2Operations_CalledPartyNumber_vals[] = {
 };
 
 static const ber_choice_t CalledPartyNumber_choice[] = {
-  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   2, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  {   3, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 3, 0, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   1, &hf_HI2Operations_iSUP_Format, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   2, &hf_HI2Operations_mAP_Format, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  {   3, &hf_HI2Operations_dSS1_Format, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1366,15 +1366,15 @@ dissect_HI2Operations_OCTET_STRING_SIZE_1_9(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t T_partyIdentity_sequence[] = {
-  { &hf_HI2Operations_imei  , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_8 },
-  { &hf_HI2Operations_tei   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_15 },
-  { &hf_HI2Operations_imsi  , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_3_8 },
-  { &hf_HI2Operations_callingPartyNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CallingPartyNumber },
-  { &hf_HI2Operations_calledPartyNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
-  { &hf_HI2Operations_msISDN, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_9 },
-  { &hf_HI2Operations_e164_Format, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
-  { &hf_HI2Operations_sip_uri, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
-  { &hf_HI2Operations_tel_url, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_imei  , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_8 },
+  { &hf_HI2Operations_tei   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_15 },
+  { &hf_HI2Operations_imsi  , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_3_8 },
+  { &hf_HI2Operations_callingPartyNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CallingPartyNumber },
+  { &hf_HI2Operations_calledPartyNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
+  { &hf_HI2Operations_msISDN, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_9 },
+  { &hf_HI2Operations_e164_Format, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_25 },
+  { &hf_HI2Operations_sip_uri, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_tel_url, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1437,9 +1437,9 @@ dissect_HI2Operations_MAP_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t Services_Information_sequence[] = {
-  { &hf_HI2Operations_iSUP_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_ISUP_parameters },
-  { &hf_HI2Operations_dSS1_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_parameters_codeset_0 },
-  { &hf_HI2Operations_mAP_parameters, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MAP_parameters },
+  { &hf_HI2Operations_iSUP_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_ISUP_parameters },
+  { &hf_HI2Operations_dSS1_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_parameters_codeset_0 },
+  { &hf_HI2Operations_mAP_parameters, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MAP_parameters },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1570,15 +1570,15 @@ dissect_HI2Operations_MAP_SS_Invoke_Components(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t Standard_Supplementary_Services_sequence[] = {
-  { &hf_HI2Operations_iSUP_SS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_ISUP_SS_parameters },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_0 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_4, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_4 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_5, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_5 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_6, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_6 },
-  { &hf_HI2Operations_dSS1_SS_parameters_codeset_7, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_parameters_codeset_7 },
-  { &hf_HI2Operations_dSS1_SS_Invoke_components, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_DSS1_SS_Invoke_Components },
-  { &hf_HI2Operations_mAP_SS_Parameters, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MAP_SS_Parameters },
-  { &hf_HI2Operations_mAP_SS_Invoke_Components, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_MAP_SS_Invoke_Components },
+  { &hf_HI2Operations_iSUP_SS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_ISUP_SS_parameters },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_0, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_0 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_4, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_4 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_5, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_5 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_6, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_6 },
+  { &hf_HI2Operations_dSS1_SS_parameters_codeset_7, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_parameters_codeset_7 },
+  { &hf_HI2Operations_dSS1_SS_Invoke_components, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_DSS1_SS_Invoke_Components },
+  { &hf_HI2Operations_mAP_SS_Parameters, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MAP_SS_Parameters },
+  { &hf_HI2Operations_mAP_SS_Invoke_Components, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_MAP_SS_Invoke_Components },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1629,8 +1629,8 @@ static const value_string HI2Operations_Non_Standard_Supplementary_Services_item
 };
 
 static const ber_choice_t Non_Standard_Supplementary_Services_item_choice[] = {
-  {   1, &hf_HI2Operations_simpleIndication, BER_CLASS_CON, 1, 0, dissect_HI2Operations_SimpleIndication },
-  {   2, &hf_HI2Operations_sciData, BER_CLASS_CON, 2, 0, dissect_HI2Operations_SciDataMode },
+  {   1, &hf_HI2Operations_simpleIndication, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SimpleIndication },
+  {   2, &hf_HI2Operations_sciData, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SciDataMode },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1671,9 +1671,9 @@ dissect_HI2Operations_Other_Services(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t Supplementary_Services_sequence[] = {
-  { &hf_HI2Operations_standard_Supplementary_Services, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Standard_Supplementary_Services },
-  { &hf_HI2Operations_non_Standard_Supplementary_Services, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Non_Standard_Supplementary_Services },
-  { &hf_HI2Operations_other_Services, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Other_Services },
+  { &hf_HI2Operations_standard_Supplementary_Services, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Standard_Supplementary_Services },
+  { &hf_HI2Operations_non_Standard_Supplementary_Services, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Non_Standard_Supplementary_Services },
+  { &hf_HI2Operations_other_Services, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Other_Services },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1703,8 +1703,8 @@ static const value_string HI2Operations_DataNodeAddress_vals[] = {
 };
 
 static const ber_choice_t DataNodeAddress_choice[] = {
-  {   1, &hf_HI2Operations_ipAddress, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IPAddress },
-  {   2, &hf_HI2Operations_x25Address, BER_CLASS_CON, 2, 0, dissect_HI2Operations_X25Address },
+  {   1, &hf_HI2Operations_ipAddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IPAddress },
+  {   2, &hf_HI2Operations_x25Address, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_X25Address },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -1739,9 +1739,9 @@ dissect_HI2Operations_OCTET_STRING_SIZE_2(gboolean implicit_tag _U_, tvbuff_t *t
 
 
 static const ber_sequence_t GPRS_parameters_sequence[] = {
-  { &hf_HI2Operations_pDP_address_allocated_to_the_target, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_aPN   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_100 },
-  { &hf_HI2Operations_pDP_type, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
+  { &hf_HI2Operations_pDP_address_allocated_to_the_target, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_aPN   , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_100 },
+  { &hf_HI2Operations_pDP_type, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1755,7 +1755,7 @@ dissect_HI2Operations_GPRS_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _
 
 
 static const ber_sequence_t Services_Data_Information_sequence[] = {
-  { &hf_HI2Operations_gPRS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRS_parameters },
+  { &hf_HI2Operations_gPRS_parameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRS_parameters },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1769,11 +1769,11 @@ dissect_HI2Operations_Services_Data_Information(gboolean implicit_tag _U_, tvbuf
 
 
 static const ber_sequence_t PartyInformation_sequence[] = {
-  { &hf_HI2Operations_party_Qualifier, BER_CLASS_CON, 0, 0, dissect_HI2Operations_T_party_Qualifier },
-  { &hf_HI2Operations_partyIdentity, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_partyIdentity },
-  { &hf_HI2Operations_services_Information, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Services_Information },
-  { &hf_HI2Operations_supplementary_Services_Information, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Supplementary_Services },
-  { &hf_HI2Operations_services_Data_Information, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Services_Data_Information },
+  { &hf_HI2Operations_party_Qualifier, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_party_Qualifier },
+  { &hf_HI2Operations_partyIdentity, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_partyIdentity },
+  { &hf_HI2Operations_services_Information, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Services_Information },
+  { &hf_HI2Operations_supplementary_Services_Information, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Supplementary_Services },
+  { &hf_HI2Operations_services_Data_Information, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Services_Data_Information },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1818,10 +1818,10 @@ dissect_HI2Operations_CCLink_State(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t CallContentLinkCharacteristics_sequence[] = {
-  { &hf_HI2Operations_cCLink_State, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CCLink_State },
-  { &hf_HI2Operations_release_Time, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
-  { &hf_HI2Operations_release_Reason, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
-  { &hf_HI2Operations_lEMF_Address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
+  { &hf_HI2Operations_cCLink_State, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCLink_State },
+  { &hf_HI2Operations_release_Time, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
+  { &hf_HI2Operations_release_Reason, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
+  { &hf_HI2Operations_lEMF_Address, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CalledPartyNumber },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1835,8 +1835,8 @@ dissect_HI2Operations_CallContentLinkCharacteristics(gboolean implicit_tag _U_,
 
 
 static const ber_sequence_t T_callContentLinkInformation_sequence[] = {
-  { &hf_HI2Operations_cCLink1Characteristics, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallContentLinkCharacteristics },
-  { &hf_HI2Operations_cCLink2Characteristics, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallContentLinkCharacteristics },
+  { &hf_HI2Operations_cCLink1Characteristics, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallContentLinkCharacteristics },
+  { &hf_HI2Operations_cCLink2Characteristics, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallContentLinkCharacteristics },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1932,10 +1932,10 @@ dissect_HI2Operations_OCTET_STRING_SIZE_1_270(gboolean implicit_tag _U_, tvbuff_
 
 
 static const ber_sequence_t T_sMS_Contents_sequence[] = {
-  { &hf_HI2Operations_initiator, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_initiator },
-  { &hf_HI2Operations_transfer_status, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_transfer_status },
-  { &hf_HI2Operations_other_message, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_other_message },
-  { &hf_HI2Operations_content, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_270 },
+  { &hf_HI2Operations_initiator, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_initiator },
+  { &hf_HI2Operations_transfer_status, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_transfer_status },
+  { &hf_HI2Operations_other_message, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_other_message },
+  { &hf_HI2Operations_content, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_270 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -1949,9 +1949,9 @@ dissect_HI2Operations_T_sMS_Contents(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t SMS_report_sequence[] = {
-  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 1, 0, dissect_HI2Operations_CommunicationIdentifier },
-  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 2, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
-  { &hf_HI2Operations_sMS_Contents, BER_CLASS_CON, 3, 0, dissect_HI2Operations_T_sMS_Contents },
+  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CommunicationIdentifier },
+  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
+  { &hf_HI2Operations_sMS_Contents, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_sMS_Contents },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2036,8 +2036,8 @@ static const value_string HI2Operations_UmtsQos_vals[] = {
 };
 
 static const ber_choice_t UmtsQos_choice[] = {
-  {   1, &hf_HI2Operations_qosMobileRadio, BER_CLASS_CON, 1, 0, dissect_HI2Operations_OCTET_STRING },
-  {   2, &hf_HI2Operations_qosGn , BER_CLASS_CON, 2, 0, dissect_HI2Operations_OCTET_STRING },
+  {   1, &hf_HI2Operations_qosMobileRadio, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
+  {   2, &hf_HI2Operations_qosGn , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2126,8 +2126,8 @@ static const value_string HI2Operations_LocationType_vals[] = {
 };
 
 static const ber_choice_t LocationType_choice[] = {
-  {   0, &hf_HI2Operations_geodeticData, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  {   1, &hf_HI2Operations_nameAddress, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_PrintableString_SIZE_1_100 },
+  {   0, &hf_HI2Operations_geodeticData, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
+  {   1, &hf_HI2Operations_nameAddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_1_100 },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2245,8 +2245,8 @@ dissect_HI2Operations_VisibleString_SIZE_1_15_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t CallId_sequence[] = {
-  { &hf_HI2Operations_sequencenumber, BER_CLASS_CON, 0, 0, dissect_HI2Operations_VisibleString_SIZE_1_25_ },
-  { &hf_HI2Operations_systemidentity, BER_CLASS_CON, 1, 0, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
+  { &hf_HI2Operations_sequencenumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_25_ },
+  { &hf_HI2Operations_systemidentity, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2291,25 +2291,25 @@ dissect_HI2Operations_VisibleString_SIZE_1_48_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t PartyId_sequence[] = {
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved2, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved3, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved4, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved5, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_dn    , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
-  { &hf_HI2Operations_userProvided, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
-  { &hf_HI2Operations_reserved6, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved7, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_ipAddress_01, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_reserved8, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_trunkId, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_reserved9, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_genericAddress, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_genericDigits, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_genericName, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_48_ },
-  { &hf_HI2Operations_port  , BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  { &hf_HI2Operations_context, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved2, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved3, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved4, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved5, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_dn    , BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
+  { &hf_HI2Operations_userProvided, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_15_ },
+  { &hf_HI2Operations_reserved6, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved7, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_ipAddress_01, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_reserved8, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_trunkId, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_reserved9, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_genericAddress, BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_genericDigits, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_genericName, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_48_ },
+  { &hf_HI2Operations_port  , BER_CLASS_CON, 17, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  { &hf_HI2Operations_context, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2323,11 +2323,11 @@ dissect_HI2Operations_PartyId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t Answer_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_answering, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_answering, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2352,8 +2352,8 @@ dissect_HI2Operations_VisibleString_SIZE_1_20_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t T_sepCCCpair_sequence[] = {
-  { &hf_HI2Operations_sepXmitCCC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
-  { &hf_HI2Operations_sepRecvCCC, BER_CLASS_CON, 1, 0, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
+  { &hf_HI2Operations_sepXmitCCC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
+  { &hf_HI2Operations_sepRecvCCC, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2373,8 +2373,8 @@ static const value_string HI2Operations_CCCId_vals[] = {
 };
 
 static const ber_choice_t CCCId_choice[] = {
-  {   0, &hf_HI2Operations_combCCC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
-  {   1, &hf_HI2Operations_sepCCCpair, BER_CLASS_CON, 1, 0, dissect_HI2Operations_T_sepCCCpair },
+  {   0, &hf_HI2Operations_combCCC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_20_ },
+  {   1, &hf_HI2Operations_sepCCCpair, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_sepCCCpair },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2406,11 +2406,11 @@ dissect_HI2Operations_FlowDirection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t CCClose_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
   { &hf_HI2Operations_cCCId , BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CCCId },
-  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 4, 0, dissect_HI2Operations_FlowDirection },
+  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_FlowDirection },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2443,8 +2443,8 @@ static const value_string HI2Operations_T_ccOpenOption_vals[] = {
 };
 
 static const ber_choice_t T_ccOpenOption_choice[] = {
-  {   3, &hf_HI2Operations_ccOpenTime, BER_CLASS_CON, 3, 0, dissect_HI2Operations_SEQUENCE_OF_CallId },
-  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, 0, dissect_HI2Operations_NULL },
+  {   3, &hf_HI2Operations_ccOpenTime, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_CallId },
+  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2470,14 +2470,14 @@ dissect_HI2Operations_SDP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 
 static const ber_sequence_t CCOpen_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
   { &hf_HI2Operations_ccOpenOption, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_T_ccOpenOption },
   { &hf_HI2Operations_cCCId , BER_CLASS_CON, 5, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CCCId },
-  { &hf_HI2Operations_subject, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_associate, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 8, 0, dissect_HI2Operations_FlowDirection },
+  { &hf_HI2Operations_subject, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_associate, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_HI2Operations_FlowDirection },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2497,8 +2497,8 @@ static const value_string HI2Operations_T_input_vals[] = {
 };
 
 static const ber_choice_t T_input_choice[] = {
-  {   6, &hf_HI2Operations_userinput, BER_CLASS_CON, 6, 0, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
-  {   7, &hf_HI2Operations_translationinput, BER_CLASS_CON, 7, 0, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  {   6, &hf_HI2Operations_userinput, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
+  {   7, &hf_HI2Operations_translationinput, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_32_ },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2524,15 +2524,15 @@ dissect_HI2Operations_TransitCarrierId(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 
 static const ber_sequence_t Origination_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, 0, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { &hf_HI2Operations_input , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_T_input },
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 8, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TransitCarrierId },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TransitCarrierId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2546,16 +2546,16 @@ dissect_HI2Operations_Origination(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t Redirection_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_old   , BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_redirectedto, BER_CLASS_CON, 4, 0, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TransitCarrierId },
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 7, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_new   , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_redirectedfrom, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_old   , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_redirectedto, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_transitCarrierId, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TransitCarrierId },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_reserved1, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_new   , BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_redirectedfrom, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2569,10 +2569,10 @@ dissect_HI2Operations_Redirection(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t Release_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2596,9 +2596,9 @@ dissect_HI2Operations_INTEGER_1_100_(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t RedirectedFromInfo_sequence[] = {
-  { &hf_HI2Operations_lastRedirecting, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_originalCalled, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_numRedirections, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_INTEGER_1_100_ },
+  { &hf_HI2Operations_lastRedirecting, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_originalCalled, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_numRedirections, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER_1_100_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2612,14 +2612,14 @@ dissect_HI2Operations_RedirectedFromInfo(gboolean implicit_tag _U_, tvbuff_t *tv
 
 
 static const ber_sequence_t TerminationAttempt_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, 0, dissect_HI2Operations_NULL },
-  { &hf_HI2Operations_redirectedFromInfo, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_RedirectedFromInfo },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_calling, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_called, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_reserved0, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  { &hf_HI2Operations_redirectedFromInfo, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_RedirectedFromInfo },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2649,15 +2649,15 @@ dissect_HI2Operations_ResourceState(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t CCChange_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
   { &hf_HI2Operations_cCCId , BER_CLASS_CON, 4, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CCCId },
-  { &hf_HI2Operations_subject, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_associate, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 7, 0, dissect_HI2Operations_FlowDirection },
-  { &hf_HI2Operations_resourceState, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_ResourceState },
+  { &hf_HI2Operations_subject, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_associate, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_flowDirection, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_FlowDirection },
+  { &hf_HI2Operations_resourceState, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_ResourceState },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2759,15 +2759,15 @@ dissect_HI2Operations_VisibleString_SIZE_1_40_(gboolean implicit_tag _U_, tvbuff
 
 
 static const ber_sequence_t TerminalDisplayInfo_sequence[] = {
-  { &hf_HI2Operations_generalDisplay, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_80_ },
-  { &hf_HI2Operations_calledNumber, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_callingNumber, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_callingName, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_originalCalledNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_lastRedirectingNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_redirectingName, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_redirectingReason, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
-  { &hf_HI2Operations_messageWaitingNotif, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_generalDisplay, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_80_ },
+  { &hf_HI2Operations_calledNumber, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_callingNumber, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_callingName, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_originalCalledNumber, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_lastRedirectingNumber, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_redirectingName, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_redirectingReason, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
+  { &hf_HI2Operations_messageWaitingNotif, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_40_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2792,14 +2792,14 @@ dissect_HI2Operations_VisibleString_SIZE_1_128_(gboolean implicit_tag _U_, tvbuf
 
 
 static const ber_sequence_t NetworkSignal_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_alertingSignal, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_AlertingSignal },
-  { &hf_HI2Operations_subjectAudibleSignal, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_AudibleSignal },
-  { &hf_HI2Operations_terminalDisplayInfo, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TerminalDisplayInfo },
-  { &hf_HI2Operations_other , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_alertingSignal, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AlertingSignal },
+  { &hf_HI2Operations_subjectAudibleSignal, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AudibleSignal },
+  { &hf_HI2Operations_terminalDisplayInfo, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TerminalDisplayInfo },
+  { &hf_HI2Operations_other , BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2813,10 +2813,10 @@ dissect_HI2Operations_NetworkSignal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t T_signal_sequence[] = {
-  { &hf_HI2Operations_switchhookFlash, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_dialedDigits, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_featureKey, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_otherSignalingInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_switchhookFlash, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_dialedDigits, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_featureKey, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_otherSignalingInformation, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2830,11 +2830,11 @@ dissect_HI2Operations_T_signal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t SubjectSignal_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_signal, BER_CLASS_CON, 4, 0, dissect_HI2Operations_T_signal },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_signal, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_signal },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2848,12 +2848,12 @@ dissect_HI2Operations_SubjectSignal(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 
 
 static const ber_sequence_t MediaReport_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_subject, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
-  { &hf_HI2Operations_associate, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_subject, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
+  { &hf_HI2Operations_associate, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SDP },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2867,16 +2867,16 @@ dissect_HI2Operations_MediaReport(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t ServiceInstance_sequence[] = {
-  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, 0, dissect_HI2Operations_CaseId },
-  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, 0, dissect_HI2Operations_AccessingElementId },
-  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, 0, dissect_HI2Operations_EventTime },
-  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_relatedCallId, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CallId },
-  { &hf_HI2Operations_serviceName, BER_CLASS_CON, 5, 0, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
-  { &hf_HI2Operations_firstCallCalling, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_secondCallCalling, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_called, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
-  { &hf_HI2Operations_calling, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_caseId, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CaseId },
+  { &hf_HI2Operations_accessingElementId, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_AccessingElementId },
+  { &hf_HI2Operations_eventTime, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_EventTime },
+  { &hf_HI2Operations_callId, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_relatedCallId, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CallId },
+  { &hf_HI2Operations_serviceName, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_VisibleString_SIZE_1_128_ },
+  { &hf_HI2Operations_firstCallCalling, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_secondCallCalling, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_called, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
+  { &hf_HI2Operations_calling, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyId },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2913,25 +2913,25 @@ static const value_string HI2Operations_Message_vals[] = {
 };
 
 static const ber_choice_t Message_choice[] = {
-  {   1, &hf_HI2Operations_answer, BER_CLASS_CON, 1, 0, dissect_HI2Operations_Answer },
-  {   2, &hf_HI2Operations_ccclose, BER_CLASS_CON, 2, 0, dissect_HI2Operations_CCClose },
-  {   3, &hf_HI2Operations_ccopen, BER_CLASS_CON, 3, 0, dissect_HI2Operations_CCOpen },
-  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, 0, dissect_HI2Operations_NULL },
-  {   5, &hf_HI2Operations_origination, BER_CLASS_CON, 5, 0, dissect_HI2Operations_Origination },
-  {   6, &hf_HI2Operations_reserved1, BER_CLASS_CON, 6, 0, dissect_HI2Operations_NULL },
-  {   7, &hf_HI2Operations_redirection, BER_CLASS_CON, 7, 0, dissect_HI2Operations_Redirection },
-  {   8, &hf_HI2Operations_release, BER_CLASS_CON, 8, 0, dissect_HI2Operations_Release },
-  {   9, &hf_HI2Operations_reserved2, BER_CLASS_CON, 9, 0, dissect_HI2Operations_NULL },
-  {  10, &hf_HI2Operations_terminationattempt, BER_CLASS_CON, 10, 0, dissect_HI2Operations_TerminationAttempt },
-  {  11, &hf_HI2Operations_reserved, BER_CLASS_CON, 11, 0, dissect_HI2Operations_NULL },
-  {  12, &hf_HI2Operations_ccchange, BER_CLASS_CON, 12, 0, dissect_HI2Operations_CCChange },
-  {  13, &hf_HI2Operations_reserved3, BER_CLASS_CON, 13, 0, dissect_HI2Operations_NULL },
-  {  14, &hf_HI2Operations_reserved4, BER_CLASS_CON, 14, 0, dissect_HI2Operations_NULL },
-  {  15, &hf_HI2Operations_reserved5, BER_CLASS_CON, 15, 0, dissect_HI2Operations_NULL },
-  {  16, &hf_HI2Operations_networksignal, BER_CLASS_CON, 16, 0, dissect_HI2Operations_NetworkSignal },
-  {  17, &hf_HI2Operations_subjectsignal, BER_CLASS_CON, 17, 0, dissect_HI2Operations_SubjectSignal },
-  {  18, &hf_HI2Operations_mediareport, BER_CLASS_CON, 18, 0, dissect_HI2Operations_MediaReport },
-  {  19, &hf_HI2Operations_serviceinstance, BER_CLASS_CON, 19, 0, dissect_HI2Operations_ServiceInstance },
+  {   1, &hf_HI2Operations_answer, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Answer },
+  {   2, &hf_HI2Operations_ccclose, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCClose },
+  {   3, &hf_HI2Operations_ccopen, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCOpen },
+  {   4, &hf_HI2Operations_reserved0, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {   5, &hf_HI2Operations_origination, BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Origination },
+  {   6, &hf_HI2Operations_reserved1, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {   7, &hf_HI2Operations_redirection, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Redirection },
+  {   8, &hf_HI2Operations_release, BER_CLASS_CON, 8, BER_FLAGS_IMPLTAG, dissect_HI2Operations_Release },
+  {   9, &hf_HI2Operations_reserved2, BER_CLASS_CON, 9, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  10, &hf_HI2Operations_terminationattempt, BER_CLASS_CON, 10, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TerminationAttempt },
+  {  11, &hf_HI2Operations_reserved, BER_CLASS_CON, 11, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  12, &hf_HI2Operations_ccchange, BER_CLASS_CON, 12, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CCChange },
+  {  13, &hf_HI2Operations_reserved3, BER_CLASS_CON, 13, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  14, &hf_HI2Operations_reserved4, BER_CLASS_CON, 14, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  15, &hf_HI2Operations_reserved5, BER_CLASS_CON, 15, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NULL },
+  {  16, &hf_HI2Operations_networksignal, BER_CLASS_CON, 16, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NetworkSignal },
+  {  17, &hf_HI2Operations_subjectsignal, BER_CLASS_CON, 17, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SubjectSignal },
+  {  18, &hf_HI2Operations_mediareport, BER_CLASS_CON, 18, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MediaReport },
+  {  19, &hf_HI2Operations_serviceinstance, BER_CLASS_CON, 19, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ServiceInstance },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2946,8 +2946,8 @@ dissect_HI2Operations_Message(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t CdcPdu_sequence[] = {
-  { &hf_HI2Operations_protocolVersion, BER_CLASS_CON, 0, 0, dissect_HI2Operations_ProtocolVersion },
-  { &hf_HI2Operations_message, BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Message },
+  { &hf_HI2Operations_protocolVersion, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ProtocolVersion },
+  { &hf_HI2Operations_message, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_Message },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2968,9 +2968,9 @@ static const value_string HI2Operations_UserSignalType_vals[] = {
 };
 
 static const ber_choice_t UserSignalType_choice[] = {
-  {   0, &hf_HI2Operations_copySignal, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  {   1, &hf_HI2Operations_interpretedSignal, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  {   2, &hf_HI2Operations_cdcPdu, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_CdcPdu },
+  {   0, &hf_HI2Operations_copySignal, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
+  {   1, &hf_HI2Operations_interpretedSignal, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
+  {   2, &hf_HI2Operations_cdcPdu, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CdcPdu },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -2985,15 +2985,15 @@ dissect_HI2Operations_UserSignalType(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t TARGETACTIVITYMONITOR_1_sequence[] = {
-  { &hf_HI2Operations_version, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_lIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_LIIDType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetLocation, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType },
-  { &hf_HI2Operations_direction, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_DirectionType },
-  { &hf_HI2Operations_iRITransaction, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_IRITransactionType },
-  { &hf_HI2Operations_iRITransactionNumber, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_userSignal, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UserSignalType },
-  { &hf_HI2Operations_cryptoCheckSum, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_version, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
+  { &hf_HI2Operations_lIInstanceid, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LIIDType },
+  { &hf_HI2Operations_timestamp, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
+  { &hf_HI2Operations_targetLocation, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType },
+  { &hf_HI2Operations_direction, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_DirectionType },
+  { &hf_HI2Operations_iRITransaction, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRITransactionType },
+  { &hf_HI2Operations_iRITransactionNumber, BER_CLASS_CON, 6, BER_FLAGS_IMPLTAG, dissect_HI2Operations_INTEGER },
+  { &hf_HI2Operations_userSignal, BER_CLASS_CON, 7, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UserSignalType },
+  { &hf_HI2Operations_cryptoCheckSum, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3036,8 +3036,8 @@ dissect_HI2Operations_T_cc(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static const ber_sequence_t IRI_to_CC_Correlation_sequence[] = {
-  { &hf_HI2Operations_cc    , BER_CLASS_CON, 0, 0, dissect_HI2Operations_T_cc },
-  { &hf_HI2Operations_iri   , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_cc    , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_cc },
+  { &hf_HI2Operations_iri   , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3061,8 +3061,8 @@ dissect_HI2Operations_IRI_to_IRI_Correlation(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t T_both_IRI_CC_sequence[] = {
-  { &hf_HI2Operations_iri_CC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_IRI_to_CC_Correlation },
-  { &hf_HI2Operations_iri_IRI, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRI_to_IRI_Correlation },
+  { &hf_HI2Operations_iri_CC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_CC_Correlation },
+  { &hf_HI2Operations_iri_IRI, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_IRI_Correlation },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3083,9 +3083,9 @@ static const value_string HI2Operations_CorrelationValues_vals[] = {
 };
 
 static const ber_choice_t CorrelationValues_choice[] = {
-  {   0, &hf_HI2Operations_iri_to_CC, BER_CLASS_CON, 0, 0, dissect_HI2Operations_IRI_to_CC_Correlation },
-  {   1, &hf_HI2Operations_iri_to_iri, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRI_to_IRI_Correlation },
-  {   2, &hf_HI2Operations_both_IRI_CC, BER_CLASS_CON, 2, 0, dissect_HI2Operations_T_both_IRI_CC },
+  {   0, &hf_HI2Operations_iri_to_CC, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_CC_Correlation },
+  {   1, &hf_HI2Operations_iri_to_iri, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_to_IRI_Correlation },
+  {   2, &hf_HI2Operations_both_IRI_CC, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_both_IRI_CC },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3155,10 +3155,10 @@ dissect_HI2Operations_CellIdType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 
 static const ber_sequence_t TETRACGIType_sequence[] = {
-  { &hf_HI2Operations_mcc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MCCType },
-  { &hf_HI2Operations_mnc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MNCType },
-  { &hf_HI2Operations_lai_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_LocationAreaType },
-  { &hf_HI2Operations_cI    , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_CellIdType },
+  { &hf_HI2Operations_mcc_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType },
+  { &hf_HI2Operations_mnc_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType },
+  { &hf_HI2Operations_lai_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LocationAreaType },
+  { &hf_HI2Operations_cI    , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CellIdType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3183,9 +3183,9 @@ dissect_HI2Operations_SSIType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 static const ber_sequence_t TSIType_sequence[] = {
-  { &hf_HI2Operations_mcc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MCCType },
-  { &hf_HI2Operations_mnc_01, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_MNCType },
-  { &hf_HI2Operations_ssi   , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SSIType },
+  { &hf_HI2Operations_mcc_01, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MCCType },
+  { &hf_HI2Operations_mnc_01, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_MNCType },
+  { &hf_HI2Operations_ssi   , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_SSIType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3253,12 +3253,12 @@ static const value_string HI2Operations_TETRAAddressType_vals[] = {
 };
 
 static const ber_choice_t TETRAAddressType_choice[] = {
-  {   0, &hf_HI2Operations_tETRAaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TSIType },
-  {   1, &hf_HI2Operations_pISNaddress, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_NumericString_SIZE_20 },
-  {   2, &hf_HI2Operations_iP4address, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING_SIZE_32 },
-  {   3, &hf_HI2Operations_iP6address, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING_SIZE_128 },
-  {   4, &hf_HI2Operations_e164address, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_NumericString_SIZE_20 },
-  {   5, &hf_HI2Operations_tEI   , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TEIType },
+  {   0, &hf_HI2Operations_tETRAaddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TSIType },
+  {   1, &hf_HI2Operations_pISNaddress, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NumericString_SIZE_20 },
+  {   2, &hf_HI2Operations_iP4address, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING_SIZE_32 },
+  {   3, &hf_HI2Operations_iP6address, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING_SIZE_128 },
+  {   4, &hf_HI2Operations_e164address, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_NumericString_SIZE_20 },
+  {   5, &hf_HI2Operations_tEI   , BER_CLASS_CON, 5, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TEIType },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3279,8 +3279,8 @@ static const value_string HI2Operations_LocationType_en301040_vals[] = {
 };
 
 static const ber_choice_t LocationType_en301040_choice[] = {
-  {   0, &hf_HI2Operations_mSLoc , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TETRACGIType },
-  {   1, &hf_HI2Operations_lSLoc , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TETRAAddressType },
+  {   0, &hf_HI2Operations_mSLoc , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TETRACGIType },
+  {   1, &hf_HI2Operations_lSLoc , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TETRAAddressType },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3454,12 +3454,12 @@ dissect_HI2Operations_SSType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 
 static const ber_sequence_t ActivityType_sequence[] = {
-  { &hf_HI2Operations_cctivity, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_ActivityClassType },
-  { &hf_HI2Operations_callRelation, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_T_callRelation },
-  { &hf_HI2Operations_direction_01, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_T_direction },
-  { &hf_HI2Operations_scope , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_T_scope },
-  { &hf_HI2Operations_cPlaneData, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  { &hf_HI2Operations_sStype, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SSType },
+  { &hf_HI2Operations_cctivity, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ActivityClassType },
+  { &hf_HI2Operations_callRelation, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_callRelation },
+  { &hf_HI2Operations_direction_01, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_direction },
+  { &hf_HI2Operations_scope , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_scope },
+  { &hf_HI2Operations_cPlaneData, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_sStype, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SSType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3486,8 +3486,8 @@ dissect_HI2Operations_SEQUENCE_OF_TETRAAddressType(gboolean implicit_tag _U_, tv
 
 
 static const ber_sequence_t AddressType_sequence[] = {
-  { &hf_HI2Operations_tSI   , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TSIType },
-  { &hf_HI2Operations_supplementaryAddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_TETRAAddressType },
+  { &hf_HI2Operations_tSI   , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TSIType },
+  { &hf_HI2Operations_supplementaryAddress, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_TETRAAddressType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3527,13 +3527,13 @@ dissect_HI2Operations_SEQUENCE_OF_LocationType_en301040(gboolean implicit_tag _U
 
 
 static const ber_sequence_t TARGETACTIVITYMONITORind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetLocation_01, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
-  { &hf_HI2Operations_targetAction, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_ActivityType },
-  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_AddressType },
-  { &hf_HI2Operations_cotargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
-  { &hf_HI2Operations_cotargetlocation, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_LocationType_en301040 },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_timestamp, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
+  { &hf_HI2Operations_targetLocation_01, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
+  { &hf_HI2Operations_targetAction, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_ActivityType },
+  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AddressType },
+  { &hf_HI2Operations_cotargetaddress, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
+  { &hf_HI2Operations_cotargetlocation, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_LocationType_en301040 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3571,13 +3571,13 @@ dissect_HI2Operations_SEQUENCE_OF_CircuitIdType(gboolean implicit_tag _U_, tvbuf
 
 
 static const ber_sequence_t TARGETCOMMSMONITORind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetlocation, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
-  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_AddressType },
-  { &hf_HI2Operations_targetcommsid, BER_CLASS_UNI, BER_UNI_TAG_NumericString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_CircuitIdType },
-  { &hf_HI2Operations_cotargetaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
-  { &hf_HI2Operations_cotargetcommsid, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_CircuitIdType },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_timestamp, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_UTCTime },
+  { &hf_HI2Operations_targetlocation, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_LocationType_en301040 },
+  { &hf_HI2Operations_supplementaryTargetaddress, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_AddressType },
+  { &hf_HI2Operations_targetcommsid, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CircuitIdType },
+  { &hf_HI2Operations_cotargetaddress, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_AddressType },
+  { &hf_HI2Operations_cotargetcommsid, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SEQUENCE_OF_CircuitIdType },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3591,8 +3591,8 @@ dissect_HI2Operations_TARGETCOMMSMONITORind(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t TTRAFFICind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_trafficPacket, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_trafficPacket, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3606,8 +3606,8 @@ dissect_HI2Operations_TTRAFFICind(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 static const ber_sequence_t CTTRAFFICind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_trafficPacket, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
+  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_TLIIdType },
+  { &hf_HI2Operations_trafficPacket, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_BIT_STRING },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3632,7 +3632,7 @@ dissect_HI2Operations_PrintableString_SIZE_2(gboolean implicit_tag _U_, tvbuff_t
 
 
 static const ber_sequence_t National_HI2_ASN1parameters_sequence[] = {
-  { &hf_HI2Operations_countryCode, BER_CLASS_CON, 1, 0, dissect_HI2Operations_PrintableString_SIZE_2 },
+  { &hf_HI2Operations_countryCode, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_PrintableString_SIZE_2 },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3646,45 +3646,45 @@ dissect_HI2Operations_National_HI2_ASN1parameters(gboolean implicit_tag _U_, tvb
 
 
 static const ber_sequence_t IRI_Parameters_sequence[] = {
-  { &hf_HI2Operations_domainID, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OBJECT_IDENTIFIER },
-  { &hf_HI2Operations_iRIversion, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_iRIversion },
-  { &hf_HI2Operations_lawfulInterceptionIdentifier, BER_CLASS_CON, 1, 0, dissect_HI2Operations_LawfulInterceptionIdentifier },
-  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 2, 0, dissect_HI2Operations_CommunicationIdentifier },
-  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 3, BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
-  { &hf_HI2Operations_intercepted_Call_Direct, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_intercepted_Call_Direct },
-  { &hf_HI2Operations_intercepted_Call_State, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Intercepted_Call_State },
-  { &hf_HI2Operations_ringingDuration, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
-  { &hf_HI2Operations_conversationDuration, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
-  { &hf_HI2Operations_locationOfTheTarget, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Location },
-  { &hf_HI2Operations_partyInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SET_SIZE_1_10_OF_PartyInformation },
-  { &hf_HI2Operations_callContentLinkInformation, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_callContentLinkInformation },
-  { &hf_HI2Operations_release_Reason_Of_Intercepted_Call, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
-  { &hf_HI2Operations_nature_Of_The_intercepted_call, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL, dissect_HI2Operations_T_nature_Of_The_intercepted_call },
-  { &hf_HI2Operations_serverCenterAddress, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL, dissect_HI2Operations_PartyInformation },
-  { &hf_HI2Operations_sMS   , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL, dissect_HI2Operations_SMS_report },
-  { &hf_HI2Operations_cC_Link_Identifier, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CC_Link_Identifier },
-  { &hf_HI2Operations_national_Parameters, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL, dissect_HI2Operations_National_Parameters },
-  { &hf_HI2Operations_gPRSCorrelationNumber, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRSCorrelationNumber },
-  { &hf_HI2Operations_gPRSevent, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRSEvent },
-  { &hf_HI2Operations_sgsnAddress, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_gPRSOperationErrorCode, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL, dissect_HI2Operations_GPRSOperationErrorCode },
-  { &hf_HI2Operations_ggsnAddress, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_qOS   , BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UmtsQos },
-  { &hf_HI2Operations_networkIdentifier, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL, dissect_HI2Operations_Network_Identifier },
-  { &hf_HI2Operations_sMSOriginatingAddress, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_sMSTerminatingAddress, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
-  { &hf_HI2Operations_iMSevent, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL, dissect_HI2Operations_IMSevent },
-  { &hf_HI2Operations_sIPMessage, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING },
-  { &hf_HI2Operations_servingSGSN_number, BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_1_20 },
-  { &hf_HI2Operations_servingSGSN_address, BER_CLASS_CON, 32, BER_FLAGS_OPTIONAL, dissect_HI2Operations_OCTET_STRING_SIZE_5_17 },
-  { &hf_HI2Operations_tARGETACTIVITYMONITOR, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TARGETACTIVITYMONITOR_1 },
-  { &hf_HI2Operations_ldiEvent, BER_CLASS_CON, 34, BER_FLAGS_OPTIONAL, dissect_HI2Operations_LDIevent },
-  { &hf_HI2Operations_correlation, BER_CLASS_CON, 35, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CorrelationValues },
-  { &hf_HI2Operations_tARGETACTIVITYMONITORind, BER_CLASS_CON, 36, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TARGETACTIVITYMONITORind },
-  { &hf_HI2Operations_tARGETCOMMSMONITORind, BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TARGETCOMMSMONITORind },
-  { &hf_HI2Operations_tTRAFFICind, BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL, dissect_HI2Operations_TTRAFFICind },
-  { &hf_HI2Operations_cTTRAFFICind, BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL, dissect_HI2Operations_CTTRAFFICind },
-  { &hf_HI2Operations_national_HI2_ASN1parameters, BER_CLASS_CON, 255, BER_FLAGS_OPTIONAL, dissect_HI2Operations_National_HI2_ASN1parameters },
+  { &hf_HI2Operations_domainID, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OBJECT_IDENTIFIER },
+  { &hf_HI2Operations_iRIversion, BER_CLASS_CON, 23, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_iRIversion },
+  { &hf_HI2Operations_lawfulInterceptionIdentifier, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_LawfulInterceptionIdentifier },
+  { &hf_HI2Operations_communicationIdentifier, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_CommunicationIdentifier },
+  { &hf_HI2Operations_timeStamp, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_TimeStamp },
+  { &hf_HI2Operations_intercepted_Call_Direct, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_intercepted_Call_Direct },
+  { &hf_HI2Operations_intercepted_Call_State, BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Intercepted_Call_State },
+  { &hf_HI2Operations_ringingDuration, BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
+  { &hf_HI2Operations_conversationDuration, BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_3 },
+  { &hf_HI2Operations_locationOfTheTarget, BER_CLASS_CON, 8, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Location },
+  { &hf_HI2Operations_partyInformation, BER_CLASS_CON, 9, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SET_SIZE_1_10_OF_PartyInformation },
+  { &hf_HI2Operations_callContentLinkInformation, BER_CLASS_CON, 10, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_callContentLinkInformation },
+  { &hf_HI2Operations_release_Reason_Of_Intercepted_Call, BER_CLASS_CON, 11, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_2 },
+  { &hf_HI2Operations_nature_Of_The_intercepted_call, BER_CLASS_CON, 12, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_T_nature_Of_The_intercepted_call },
+  { &hf_HI2Operations_serverCenterAddress, BER_CLASS_CON, 13, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_PartyInformation },
+  { &hf_HI2Operations_sMS   , BER_CLASS_CON, 14, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_SMS_report },
+  { &hf_HI2Operations_cC_Link_Identifier, BER_CLASS_CON, 15, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CC_Link_Identifier },
+  { &hf_HI2Operations_national_Parameters, BER_CLASS_CON, 16, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_National_Parameters },
+  { &hf_HI2Operations_gPRSCorrelationNumber, BER_CLASS_CON, 18, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRSCorrelationNumber },
+  { &hf_HI2Operations_gPRSevent, BER_CLASS_CON, 20, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRSEvent },
+  { &hf_HI2Operations_sgsnAddress, BER_CLASS_CON, 21, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_gPRSOperationErrorCode, BER_CLASS_CON, 22, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_GPRSOperationErrorCode },
+  { &hf_HI2Operations_ggsnAddress, BER_CLASS_CON, 24, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_qOS   , BER_CLASS_CON, 25, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_UmtsQos },
+  { &hf_HI2Operations_networkIdentifier, BER_CLASS_CON, 26, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_Network_Identifier },
+  { &hf_HI2Operations_sMSOriginatingAddress, BER_CLASS_CON, 27, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_sMSTerminatingAddress, BER_CLASS_CON, 28, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_DataNodeAddress },
+  { &hf_HI2Operations_iMSevent, BER_CLASS_CON, 29, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_IMSevent },
+  { &hf_HI2Operations_sIPMessage, BER_CLASS_CON, 30, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING },
+  { &hf_HI2Operations_servingSGSN_number, BER_CLASS_CON, 31, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_1_20 },
+  { &hf_HI2Operations_servingSGSN_address, BER_CLASS_CON, 32, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_OCTET_STRING_SIZE_5_17 },
+  { &hf_HI2Operations_tARGETACTIVITYMONITOR, BER_CLASS_CON, 33, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TARGETACTIVITYMONITOR_1 },
+  { &hf_HI2Operations_ldiEvent, BER_CLASS_CON, 34, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_LDIevent },
+  { &hf_HI2Operations_correlation, BER_CLASS_CON, 35, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_CorrelationValues },
+  { &hf_HI2Operations_tARGETACTIVITYMONITORind, BER_CLASS_CON, 36, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TARGETACTIVITYMONITORind },
+  { &hf_HI2Operations_tARGETCOMMSMONITORind, BER_CLASS_CON, 37, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TARGETCOMMSMONITORind },
+  { &hf_HI2Operations_tTRAFFICind, BER_CLASS_CON, 38, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_TTRAFFICind },
+  { &hf_HI2Operations_cTTRAFFICind, BER_CLASS_CON, 39, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_CTTRAFFICind },
+  { &hf_HI2Operations_national_HI2_ASN1parameters, BER_CLASS_CON, 255, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_HI2Operations_National_HI2_ASN1parameters },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -3706,10 +3706,10 @@ static const value_string HI2Operations_IRIContent_vals[] = {
 };
 
 static const ber_choice_t IRIContent_choice[] = {
-  {   1, &hf_HI2Operations_iRI_Begin_record, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRI_Parameters },
-  {   2, &hf_HI2Operations_iRI_End_record, BER_CLASS_CON, 2, 0, dissect_HI2Operations_IRI_Parameters },
-  {   3, &hf_HI2Operations_iRI_Continue_record, BER_CLASS_CON, 3, 0, dissect_HI2Operations_IRI_Parameters },
-  {   4, &hf_HI2Operations_iRI_Report_record, BER_CLASS_CON, 4, 0, dissect_HI2Operations_IRI_Parameters },
+  {   1, &hf_HI2Operations_iRI_Begin_record, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
+  {   2, &hf_HI2Operations_iRI_End_record, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
+  {   3, &hf_HI2Operations_iRI_Continue_record, BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
+  {   4, &hf_HI2Operations_iRI_Report_record, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRI_Parameters },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -3743,8 +3743,8 @@ static const value_string HI2Operations_IRIsContent_vals[] = {
 };
 
 static const ber_choice_t IRIsContent_choice[] = {
-  {   0, &hf_HI2Operations_iRIContent, BER_CLASS_CON, 0, 0, dissect_HI2Operations_IRIContent },
-  {   1, &hf_HI2Operations_iRISequence, BER_CLASS_CON, 1, 0, dissect_HI2Operations_IRISequence },
+  {   0, &hf_HI2Operations_iRIContent, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRIContent },
+  {   1, &hf_HI2Operations_iRISequence, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_HI2Operations_IRISequence },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
index 56deac431d0630fc065ad79daa5975793232d755..adbe1139720fead22c8656e1ca5c10c8ddc366a7 100644 (file)
@@ -349,6 +349,6 @@ proto_reg_handoff_aarp(void)
   dissector_handle_t aarp_handle;
 
   aarp_handle = create_dissector_handle(dissect_aarp, proto_aarp);
-  dissector_add("ethertype", ETHERTYPE_AARP, aarp_handle);
-  dissector_add("chdlctype", ETHERTYPE_AARP, aarp_handle);
+  dissector_add_uint("ethertype", ETHERTYPE_AARP, aarp_handle);
+  dissector_add_uint("chdlctype", ETHERTYPE_AARP, aarp_handle);
 }
index 269b7352abfc9cce66447862ed4fcfe31eb6b9ab..634f32f3eafd0475ade9ffc996d7a44125493b61 100644 (file)
@@ -68,7 +68,7 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
        line = tvb_get_ptr(tvb, offset, linelen);
 
-       if (pinfo->match_port == pinfo->destport)
+       if (pinfo->match_uint == pinfo->destport)
                is_request = TRUE;
        else
                is_request = FALSE;
@@ -187,5 +187,5 @@ proto_reg_handoff_acap(void)
        dissector_handle_t acap_handle;
 
        acap_handle = create_dissector_handle(dissect_acap, proto_acap);
-       dissector_add("tcp.port", TCP_PORT_ACAP, acap_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_ACAP, acap_handle);
 }
index 5381328fc0740b2da4ed01b92e2c473885cb94ea..3d73f93939ef4ffdba9e83406c28263222cf9bf0 100644 (file)
@@ -831,12 +831,12 @@ void proto_reg_handoff_actrace(void)
        }
        else
        {
-               dissector_delete("udp.port", actrace_udp_port, actrace_handle);
+               dissector_delete_uint("udp.port", actrace_udp_port, actrace_handle);
        }
 
        /* Set our port number for future use */
        actrace_udp_port = global_actrace_udp_port;
 
-       dissector_add("udp.port", global_actrace_udp_port, actrace_handle);
+       dissector_add_uint("udp.port", global_actrace_udp_port, actrace_handle);
 }
 
index 27b4237676f8489355dc3e7acf81c1d56634ccfd..a76377d3428b85e05f7819eb9d2c1a0408ebc388 100644 (file)
@@ -1448,9 +1448,9 @@ proto_reg_handoff_adwin(void)
                adwin_handle = new_create_dissector_handle(dissect_adwin, proto_adwin);
                adwin_prefs_initialized = TRUE;
        } else {
-               dissector_delete("udp.port", udp_port, adwin_handle);
+               dissector_delete_uint("udp.port", udp_port, adwin_handle);
        }
 
        udp_port = global_adwin_udp_port;
-       dissector_add("udp.port", global_adwin_udp_port, adwin_handle);
+       dissector_add_uint("udp.port", global_adwin_udp_port, adwin_handle);
 }
index a0369dc370a91553e3d22e61810a2d8dfd47df8f..0d7e45df4fb0d285d87e106f716f55e70ac1b57f 100644 (file)
@@ -1161,9 +1161,9 @@ proto_reg_handoff_agentx(void)
                agentx_prefs_initialized = TRUE;
        }
        else {
-               dissector_delete("tcp.port", agentx_tcp_port, agentx_handle);
+               dissector_delete_uint("tcp.port", agentx_tcp_port, agentx_handle);
        }
 
        agentx_tcp_port = global_agentx_tcp_port;
-       dissector_add("tcp.port", agentx_tcp_port, agentx_handle);
+       dissector_add_uint("tcp.port", agentx_tcp_port, agentx_handle);
 }
index e17da74d2c777515189d3eb249942936018a3b26..c2973e797ad15424e9a14e046bd8e5a4bdcb1bc3 100644 (file)
@@ -106,5 +106,5 @@ proto_reg_handoff_aim_oft(void)
 
   /* FIXME 
   aim_handle = new_create_dissector_handle(dissect_aim, proto_aim);
-  dissector_add("tcp.port", TCP_PORT_AIM, aim_handle);*/
+  dissector_add_uint("tcp.port", TCP_PORT_AIM, aim_handle);*/
 }
index 90140b4d0fafe593c15f04268a071d4c289dd504..3a8dfb6f9226a4e726ccde0a2935db437e9c6663 100644 (file)
@@ -1746,5 +1746,5 @@ proto_reg_handoff_aim(void)
        dissector_handle_t aim_handle;
 
        aim_handle = new_create_dissector_handle(dissect_aim, proto_aim);
-       dissector_add("tcp.port", TCP_PORT_AIM, aim_handle);
+       dissector_add_uint("tcp.port", TCP_PORT_AIM, aim_handle);
 }
index b4ab7e239ca5371cb6b3831a8b55a3a61cadd794..7bb670d6d02b1a58918c3ed025fd7c61e8b80e56 100644 (file)
@@ -138,5 +138,5 @@ proto_reg_handoff_airopeek(void)
   ieee80211_handle = find_dissector("wlan_datapad");
 
   airopeek_handle = create_dissector_handle(dissect_airopeek, proto_airopeek);
-  dissector_add("udp.port", 5000, airopeek_handle);
+  dissector_add_uint("udp.port", 5000, airopeek_handle);
 }
index 65e69d9c5648235a251842539a3ee017390acbf9..4e164e0d7cfea060e2dde572f06066d7f683c543 100644 (file)
@@ -874,5 +874,5 @@ proto_reg_handoff_ajp13(void)
 {
   dissector_handle_t ajp13_handle;
   ajp13_handle = create_dissector_handle(dissect_ajp13, proto_ajp13);
-  dissector_add("tcp.port", 8009, ajp13_handle);
+  dissector_add_uint("tcp.port", 8009, ajp13_handle);
 }
index fd9b184dce47f8dd1028d76770420b8c797ba7cf..38ff09a51bc560c68a9cfb80597fb89bdb9d761f 100644 (file)
@@ -1798,5 +1798,5 @@ proto_reg_handoff_alcap(void)
 {
     dissector_handle_t alcap_handle = create_dissector_handle(dissect_alcap, proto_alcap);
 
-    dissector_add("mtp3.service_indicator", ALCAP_SI, alcap_handle);
+    dissector_add_uint("mtp3.service_indicator", ALCAP_SI, alcap_handle);
 }
index 8b247017fb3bf3f59c1e54206a00a186856f5087..e70d706838ceb6e62f165feea144331a3a9ea987 100644 (file)