From: Frank Brehm Date: Sun, 17 May 2020 09:56:28 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=04c35e4d4859f6baf0d1615763775115e4bc5c68;p=config%2Fbruni%2Fetc-mint-new1.git committing changes in /etc after apt run Package changes: +libc-ares2 1.14.0-1 amd64 +libmaxminddb0 1.3.1-1 amd64 +libsmi2ldbl 0.4.8+dfsg2-15 amd64 +libwireshark-data 2.6.10-1~ubuntu18.04.0 all +libwireshark11 2.6.10-1~ubuntu18.04.0 amd64 +libwiretap8 2.6.10-1~ubuntu18.04.0 amd64 +libwscodecs2 2.6.10-1~ubuntu18.04.0 amd64 +libwsutil9 2.6.10-1~ubuntu18.04.0 amd64 +smistrip 0.4.8+dfsg2-15 all +snmp-mibs-downloader 1.1+nmu1 all +tshark 2.6.10-1~ubuntu18.04.0 amd64 +wireshark-common 2.6.10-1~ubuntu18.04.0 amd64 --- diff --git a/.etckeeper b/.etckeeper index ff76c86..86e11b0 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2782,6 +2782,18 @@ maybe chmod 0755 'smartmontools/run.d/10mail' maybe chmod 0755 'smartmontools/run.d/10powersave-notify' maybe chmod 0755 'smartmontools/run.d/60smart-notifier' maybe chmod 0755 'smartmontools/smartd_warning.d' +maybe chmod 0644 'smi.conf' +maybe chmod 0755 'snmp-mibs-downloader' +maybe chmod 0644 'snmp-mibs-downloader/iana.conf' +maybe chmod 0644 'snmp-mibs-downloader/ianalist' +maybe chmod 0644 'snmp-mibs-downloader/ianarfc.conf' +maybe chmod 0644 'snmp-mibs-downloader/ianarfclist' +maybe chmod 0644 'snmp-mibs-downloader/rfc.conf' +maybe chmod 0644 'snmp-mibs-downloader/rfclist' +maybe chmod 0644 'snmp-mibs-downloader/rfcmibs.diff' +maybe chmod 0644 'snmp-mibs-downloader/simplelist' +maybe chmod 0644 'snmp-mibs-downloader/simpleweb.conf' +maybe chmod 0644 'snmp-mibs-downloader/snmp-mibs-downloader.conf' maybe chmod 0755 'sound' maybe chmod 0755 'sound/events' maybe chmod 0644 'sound/events/gnome-2.soundlist' @@ -2954,6 +2966,8 @@ maybe chmod 0644 'vim/vimrc.tiny' maybe chmod 0644 'wgetrc' maybe chmod 0755 'wildmidi' maybe chmod 0644 'wildmidi/wildmidi.cfg' +maybe chmod 0755 'wireshark' +maybe chmod 0644 'wireshark/init.lua' maybe chmod 0755 'wpa_supplicant' maybe chmod 0755 'wpa_supplicant/action_wpa.sh' maybe chmod 0755 'wpa_supplicant/functions.sh' diff --git a/group b/group index d0eacc4..ad8b824 100644 --- a/group +++ b/group @@ -81,3 +81,4 @@ winbindd_priv:x:139: stapdev:x:140: stapusr:x:141: stapsys:x:142: +wireshark:x:143: diff --git a/group- b/group- index a8c2ee3..d0eacc4 100644 --- a/group- +++ b/group- @@ -80,3 +80,4 @@ mysql:x:138: winbindd_priv:x:139: stapdev:x:140: stapusr:x:141: +stapsys:x:142: diff --git a/gshadow b/gshadow index fbe4aee..8081d48 100644 --- a/gshadow +++ b/gshadow @@ -81,3 +81,4 @@ winbindd_priv:!:: stapdev:!:: stapusr:!:: stapsys:!:: +wireshark:!:: diff --git a/gshadow- b/gshadow- index 0a69ecd..fbe4aee 100644 --- a/gshadow- +++ b/gshadow- @@ -80,3 +80,4 @@ mysql:!:: winbindd_priv:!:: stapdev:!:: stapusr:!:: +stapsys:!:: diff --git a/smi.conf b/smi.conf new file mode 100644 index 0000000..744ec22 --- /dev/null +++ b/smi.conf @@ -0,0 +1,41 @@ +# +# smi.conf - Global SMI configuration file. +# +# Copyright (c) 2000 Frank Strauss, Technical University of Braunschweig. +# +# See the file "COPYING" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +# +# See smi_config(3) for detailed information on configuration files. +# +# Debian version by Remco van de Meent +# 20010612 + +# Extend (note the semicolon) the libsmi default module search path. +# (On Windows systems, use `;' instead of `:', and `\' instead of `/'.) + +path :/usr/share/snmp/mibs +path :/usr/share/snmp/mibs/iana +path :/usr/share/snmp/mibs/ietf +path :/usr/share/snmp/mibs/site +path :/var/lib/snmp/mibs/site +path :/usr/share/mibs/site + +# Don't show any errors by default. +level 0 + +# Preload some basic SMIv2 modules. +load SNMPv2-SMI +load SNMPv2-TC +load SNMPv2-CONF + +# Make smilint shout loud to report all errors and warnings. +smilint: level 9 + +# But please don't claim about any names longer than 32 chars. +# (note: this is the prefix of errors `namelength-32-module, +# -type, -object, -enumeration, and -bit) +smilint: hide namelength-32 + +# Preloading some more modules for special applications. +# smiquery: load IF-MIB diff --git a/snmp-mibs-downloader/iana.conf b/snmp-mibs-downloader/iana.conf new file mode 100644 index 0000000..33333c6 --- /dev/null +++ b/snmp-mibs-downloader/iana.conf @@ -0,0 +1,10 @@ +# Configuarions for IANA MIBs download from iana.org +# + +#HOST=http://www.iana.org +#DIR=assignments +DIR=/usr/share/snmp/mibs-downloader +ARCHIVE=mibiana +ARCHTYPE=dirgz +CONF=ianalist +DEST=iana diff --git a/snmp-mibs-downloader/ianalist b/snmp-mibs-downloader/ianalist new file mode 100644 index 0000000..935c015 --- /dev/null +++ b/snmp-mibs-downloader/ianalist @@ -0,0 +1,14 @@ +# updated 2016-09-01 +ianaiftype-mib IANAifType-MIB +ianalanguage-mib IANA-LANGUAGE-MIB +ianaaddressfamilynumbers-mib IANA-ADDRESS-FAMILY-NUMBERS-MIB +ianaiprouteprotocol-mib IANA-RTPROTO-MIB +ianatn3270etc-mib IANATn3270eTC-MIB +ianamalloc-mib IANA-MALLOC-MIB +ianacharset-mib IANA-CHARSET-MIB +ianaprinter-mib IANA-PRINTER-MIB +ianafinisher-mib IANA-FINISHER-MIB +ianaitualarmtc-mib IANA-ITU-ALARM-TC-MIB +ianagmplstc-mib IANA-GMPLS-TC-MIB +ianaippmmetricsregistry-mib IANA-IPPM-METRICS-REGISTRY-MIB +ianamau-mib IANA-MAU-MIB diff --git a/snmp-mibs-downloader/ianarfc.conf b/snmp-mibs-downloader/ianarfc.conf new file mode 100644 index 0000000..6330734 --- /dev/null +++ b/snmp-mibs-downloader/ianarfc.conf @@ -0,0 +1,10 @@ +# Configuarions for IANA MIBs download from rfc-editor.org +# + +DIR=/usr/share/snmp/mibs-downloader +ARCHIVE=mibrfcs +ARCHTYPE=dirgz +CONF=ianarfclist +DEST=iana +PREFIX=rfc +SUFFIX=.txt diff --git a/snmp-mibs-downloader/ianarfclist b/snmp-mibs-downloader/ianarfclist new file mode 100644 index 0000000..4478306 --- /dev/null +++ b/snmp-mibs-downloader/ianarfclist @@ -0,0 +1,4 @@ +# IANA maintained MIBs from RFCs. +# Updated 2016-09-01 +5601 IANA-PWE3-MIB +5815 IPFIX-SELECTOR-MIB diff --git a/snmp-mibs-downloader/rfc.conf b/snmp-mibs-downloader/rfc.conf new file mode 100644 index 0000000..dc1de30 --- /dev/null +++ b/snmp-mibs-downloader/rfc.conf @@ -0,0 +1,13 @@ +# Configuarions for IETF MIBs download from rfc-editor.org +# + +#HOST=http://www.rfc-editor.org +#DIR=rfc +DIR=/usr/share/snmp/mibs-downloader +ARCHIVE=mibrfcs +ARCHTYPE=dirgz +CONF=rfclist +DEST=ietf +DIFF=rfcmibs.diff +PREFIX=rfc +SUFFIX=.txt diff --git a/snmp-mibs-downloader/rfclist b/snmp-mibs-downloader/rfclist new file mode 100644 index 0000000..928d565 --- /dev/null +++ b/snmp-mibs-downloader/rfclist @@ -0,0 +1,266 @@ +# updated 2010-06-05 +1155 RFC1155-SMI +1213 RFC1213-MIB +1227 SMUX-MIB +1238 CLNS-MIB +1381 RFC1381-MIB +1382 RFC1382-MIB +1414 RFC1414-MIB +1447 SNMPv2-PARTY-MIB +1451 SNMPv2-M2M-MIB +1461 MIOX25-MIB +1471 PPP-LCP-MIB +1472 PPP-SEC-MIB +1473 PPP-IP-NCP-MIB +1474 PPP-BRIDGE-NCP-MIB +1512 FDDI-SMT73-MIB +1513 TOKEN-RING-RMON-MIB +1525 SOURCE-ROUTING-MIB +1559 DECNET-PHIV-MIB +1567 DSA-MIB +1592 DPI20-MIB +1593 IBM-6611-APPN-MIB +1611 DNS-SERVER-MIB +1612 DNS-RESOLVER-MIB +1628 UPS-MIB +1658 CHARACTER-MIB +1659 RS-232-MIB +1660 PARALLEL-MIB +1666 SNA-NAU-MIB +1694 SIP-MIB +1696 Modem-MIB +1697 RDBMS-MIB +1724 RIPv2-MIB +1742 APPLETALK-MIB +1747 SNA-SDLC-MIB +1748 TOKENRING-MIB +1749 TOKENRING-STATION-SR-MIB +1792 TCPIPX-MIB +1910 SNMPv2-USEC-MIB +2006 MIP-MIB +2020 DOT12-IF-MIB +2024 DLSW-MIB +2051 APPC-MIB +2108 SNMP-REPEATER-MIB +2115 FRAME-RELAY-DTE-MIB +2127 ISDN-MIB +2128 DIAL-CONTROL-MIB +2206 RSVP-MIB +2213 INTEGRATED-SERVICES-MIB +2214 INTEGRATED-SERVICES-GUARANTEED-MIB +2232 APPN-DLUR-MIB +2238 HPR-MIB +2266 DOT12-RPTR-MIB +2287 SYSAPPL-MIB +2320 IPOA-MIB +2417 IPATM-IPMC-MIB +2452 IPV6-TCP-MIB +2454 IPV6-UDP-MIB +2455 APPN-MIB +2456 APPN-TRAP-MIB +2457 EBN-MIB +2465 IPV6-MIB:IPV6-TC +2466 IPV6-ICMP-MIB +2494 DS0-MIB:DS0BUNDLE-MIB +2512 ATM-ACCOUNTING-INFORMATION-MIB +2513 ACCOUNTING-CONTROL-MIB +2514 ATM-TC-MIB +2515 ATM-MIB +2561 TN3270E-MIB +2562 TN3270E-RT-MIB +2564 APPLICATION-MIB +2578 SNMPv2-SMI +2579 SNMPv2-TC +2580 SNMPv2-CONF +2584 HPR-IP-MIB +2594 WWW-MIB +2605 DIRECTORY-SERVER-MIB +2613 SMON-MIB +2662 ADSL-LINE-MIB:ADSL-TC-MIB +2666 ETHER-CHIPSET-MIB +2677 NHRP-MIB +2707 Job-Monitoring-MIB +2720 FLOW-METER-MIB +2742 AGENTX-MIB +2758 SLAPM-MIB +2786 SNMP-USM-DH-OBJECTS-MIB +2787 VRRP-MIB +2788 NETWORK-SERVICES-MIB +2789 MTA-MIB +2790 HOST-RESOURCES-MIB:HOST-RESOURCES-TYPES +2819 RMON-MIB +2837 FIBRE-CHANNEL-FE-MIB +2856 HCNUM-TC +2863 IF-MIB +2864 IF-INVERTED-STACK-MIB +2922 PTOPO-MIB +2932 IPMROUTE-STD-MIB +2933 IGMP-STD-MIB +2934 PIM-MIB +2940 COPS-CLIENT-MIB +2954 FRNETSERV-MIB +2955 FR-ATM-PVC-SERVICE-IWF-MIB +2959 RTP-MIB +2981 DISMAN-EVENT-MIB +2982 DISMAN-EXPRESSION-MIB +3014 NOTIFICATION-LOG-MIB +3019 IPV6-MLD-MIB +3020 FR-MFR-MIB +3055 PINT-MIB +3083 DOCS-BPI-MIB +3144 INTERFACETOPN-MIB +3165 DISMAN-SCRIPT-MIB +3176 SFLOW-MIB +3201 CIRCUIT-IF-MIB +3202 FRSLD-MIB +3231 DISMAN-SCHEDULE-MIB +3273 HC-RMON-MIB +3287 DSMON-MIB +3289 DIFFSERV-DSCP-TC:DIFFSERV-MIB +3295 GSMP-MIB +3371 L2TP-MIB +3411 SNMP-FRAMEWORK-MIB +3412 SNMP-MPD-MIB +3413 SNMP-NOTIFICATION-MIB:SNMP-PROXY-MIB:SNMP-TARGET-MIB +3414 SNMP-USER-BASED-SM-MIB +3415 SNMP-VIEW-BASED-ACM-MIB +3416 SNMPv2-PDU +3417 SNMPv2-TM +3418 SNMPv2-MIB +3419 TRANSPORT-ADDRESS-MIB +3433 ENTITY-SENSOR-MIB +3434 HC-ALARM-MIB +3440 ADSL-LINE-EXT-MIB +3498 APS-MIB +3559 MALLOC-MIB +3584 SNMP-COMMUNITY-MIB +3591 OPT-IF-MIB +3592 SONET-MIB +3593 PerfHist-TC-MIB +3595 IPV6-FLOW-LABEL-MIB +3606 ATM2-MIB +3621 POWER-ETHERNET-MIB +3635 EtherLike-MIB +3705 HC-PerfHist-TC-MIB +3728 VDSL-LINE-MIB +3729 APM-MIB +3747 DIFFSERV-CONFIG-MIB +3805 Printer-MIB +3806 Finisher-MIB +3811 MPLS-TC-STD-MIB +3812 MPLS-TE-STD-MIB +3813 MPLS-LSR-STD-MIB +3814 MPLS-FTN-STD-MIB +3815 MPLS-LDP-ATM-STD-MIB:MPLS-LDP-FRAME-RELAY-STD-MIB:MPLS-LDP-GENERIC-STD-MIB:MPLS-LDP-STD-MIB +3816 ROHC-MIB:ROHC-RTP-MIB:ROHC-UNCOMPRESSED-MIB +3826 SNMP-USM-AES-MIB +3872 TRIP-MIB:TRIP-TC-MIB +3873 SCTP-MIB +3877 ALARM-MIB:ITU-ALARM-MIB:ITU-ALARM-TC-MIB +3878 ARC-MIB +3896 DS3-MIB +3970 TE-MIB +4001 INET-ADDRESS-MIB +4008 NAT-MIB +4011 POLICY-BASED-MANAGEMENT-MIB +4022 TCP-MIB +4036 DOCS-IETF-SUBMGT-MIB +4044 FC-MGMT-MIB +4069 VDSL-LINE-EXT-SCM-MIB +4070 VDSL-LINE-EXT-MCM-MIB +4087 TUNNEL-MIB +4113 UDP-MIB +4131 DOCS-IETF-BPI2-MIB +4133 ENTITY-MIB +4149 SSPM-MIB +4150 TPM-MIB +4188 BRIDGE-MIB +4220 TE-LINK-STD-MIB +4265 VPN-TC-STD-MIB +4268 ENTITY-STATE-MIB:ENTITY-STATE-TC-MIB +4273 BGP4-MIB +4292 IP-FORWARD-MIB +4293 IP-MIB +4295 MOBILEIPV6-MIB +4318 RSTP-MIB +4319 HDSL2-SHDSL-LINE-MIB +4323 DOCS-IETF-QOS-MIB +4363 P-BRIDGE-MIB:Q-BRIDGE-MIB +4368 MPLS-LC-ATM-STD-MIB:MPLS-LC-FR-STD-MIB +4369 IFCP-MGMT-MIB +4382 MPLS-L3VPN-STD-MIB +4404 FCIP-MGMT-MIB +4438 T11-FC-NAME-SERVER-MIB +4439 T11-FC-FABRIC-ADDR-MGR-MIB:T11-TC-MIB +4444 ISIS-MIB +4455 SCSI-MIB +4498 AGGREGATE-MIB:TIME-AGGREGATE-MIB +4502 RMON2-MIB +4544 ISCSI-MIB +4545 IPS-AUTH-MIB +4546 DOCS-IF-MIB +4547 DOCS-IETF-CABLE-DEVICE-NOTIFICATION-MIB +4560 DISMAN-NSLOOKUP-MIB:DISMAN-PING-MIB:DISMAN-TRACEROUTE-MIB +4624 MSDP-MIB +4625 T11-FC-ROUTE-MIB +4626 T11-FC-FSPF-MIB +4631 LMP-MIB +4639 DOCS-CABLE-DEVICE-MIB +4668 RADIUS-AUTH-CLIENT-MIB +4669 RADIUS-AUTH-SERVER-MIB +4670 RADIUS-ACC-CLIENT-MIB +4671 RADIUS-ACC-SERVER-MIB +4672 RADIUS-DYNAUTH-CLIENT-MIB +4673 RADIUS-DYNAUTH-SERVER-MIB +4682 PKTC-IETF-MTA-MIB +4706 ADSL2-LINE-MIB:ADSL2-LINE-TC-MIB +4711 RAQMON-MIB +4712 RAQMON-RDS-MIB +4747 T11-FC-VIRTUAL-FABRIC-MIB +4750 OSPF-MIB:OSPF-TRAP-MIB +4780 SIP-COMMON-MIB:SIP-SERVER-MIB:SIP-TC-MIB:SIP-UA-MIB +4789 SNMP-IEEE802-TM-MIB +4801 GMPLS-TC-STD-MIB +4802 GMPLS-TE-STD-MIB +4803 GMPLS-LABEL-STD-MIB:GMPLS-LSR-STD-MIB +4805 DS1-MIB +4807 IPSEC-SPD-MIB +4836 MAU-MIB +4837 DOT3-EPON-MIB +4878 DOT3-OAM-MIB +4898 TCP-ESTATS-MIB +4935 T11-FC-FABRIC-CONFIG-SERVER-MIB +4936 T11-FC-FABRIC-LOCK-MIB:T11-FC-ZONE-SERVER-MIB +4939 ISNS-MIB +4983 T11-FC-RSCN-MIB +5017 URI-TC-MIB +5060 PIM-STD-MIB +5066 EFM-CU-MIB:IF-CAP-STACK-MIB +5097 UDPLITE-MIB +5098 PKTC-IETF-SIG-MIB +5131 LANGTAG-TC-MIB +5132 IPMCAST-MIB +5190 MIDCOM-MIB +5240 PIM-BSR-MIB +5324 T11-FC-SP-AUTHENTICATION-MIB:T11-FC-SP-POLICY-MIB:T11-FC-SP-SA-MIB:T11-FC-SP-TC-MIB:T11-FC-SP-ZONING-MIB +5427 SYSLOG-TC-MIB +5428 PKTC-IETF-EVENT-MIB +5488 NEMO-MIB +5519 MGMD-STD-MIB +5525 RSERPOOL-MIB +5542 PW-TC-STD-MIB +5591 SNMP-TSM-MIB +5592 SNMP-SSH-TM-MIB +5601 PW-STD-MIB +5602 PW-MPLS-STD-MIB +5603 PW-ENET-STD-MIB +5604 PW-TDM-MIB +5605 PW-ATM-MIB +5643 OSPFV3-MIB +5650 VDSL2-LINE-MIB:VDSL2-LINE-TC-MIB +5676 SYSLOG-MSG-MIB +5728 DVB-RCS-MIB +5813 FORCES-MIB +5815 IPFIX-MIB +5833 CAPWAP-BASE-MIB +5834 CAPWAP-DOT11-MIB diff --git a/snmp-mibs-downloader/rfcmibs.diff b/snmp-mibs-downloader/rfcmibs.diff new file mode 100644 index 0000000..f8cf859 --- /dev/null +++ b/snmp-mibs-downloader/rfcmibs.diff @@ -0,0 +1,509 @@ +diff -ru /usr/local/share/snmp/rfc.orig/ADSL-LINE-MIB /usr/local/share/snmp/rfc/ADSL-LINE-MIB +--- /usr/local/share/snmp/rfc.orig/ADSL-LINE-MIB Sat Mar 3 17:27:00 2001 ++++ /usr/local/share/snmp/rfc/ADSL-LINE-MIB Tue Jan 23 00:42:41 2001 +@@ -3379,7 +3379,6 @@ + static profiles are implemented." + + OBJECT adslAtucConfMinSnrMgn +- MIN-ACCESS read-wr + MIN-ACCESS read-write + DESCRIPTION + "Read-write access is applicable when +diff -ru /usr/local/share/snmp/rfc.orig/DLSW-MIB /usr/local/share/snmp/rfc/DLSW-MIB +--- /usr/local/share/snmp/rfc.orig/DLSW-MIB Sat Mar 3 17:18:28 2001 ++++ /usr/local/share/snmp/rfc/DLSW-MIB Tue Jan 23 00:13:40 2001 +@@ -7,7 +7,7 @@ + + Counter32, Gauge32, TimeTicks, + OBJECT-TYPE, MODULE-IDENTITY, +- NOTIFICATION-TYPE FROM SNMPv2-SMI ++ NOTIFICATION-TYPE, mib-2 FROM SNMPv2-SMI + MODULE-COMPLIANCE, OBJECT-GROUP, + NOTIFICATION-GROUP FROM SNMPv2-CONF + ifIndex FROM IF-MIB +@@ -150,12 +150,12 @@ + + -- The DLSw MIB module contains an object part and a conformance part. + -- Object part is organized in the following groups: +--- (1) dlswNode -- information about this DLSw +--- (2) dlswTConn -- about adjacent DLSw partners +--- (3) dlswInterface -- about which interfaces DLSw is active on +--- (4) dlswDirectory -- about any directory of local/remote resources +--- (5) dlswCircuit -- about established circuits. +--- (6) dlswSdlc -- about SDLC data link switched devices ++-- (1) dlswNode - information about this DLSw ++-- (2) dlswTConn - about adjacent DLSw partners ++-- (3) dlswInterface - about which interfaces DLSw is active on ++-- (4) dlswDirectory - about any directory of local/remote resources ++-- (5) dlswCircuit - about established circuits. ++-- (6) dlswSdlc - about SDLC data link switched devices + + dlswNode OBJECT IDENTIFIER ::= { dlswMIB 1 } + dlswTConn OBJECT IDENTIFIER ::= { dlswMIB 2 } +@@ -168,9 +168,9 @@ + -- THE NODE GROUP + -- ******************************************************************* + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- DLSw Node Identity +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswNodeVersion OBJECT-TYPE + SYNTAX OCTET STRING (SIZE (2)) + MAX-ACCESS read-only +@@ -211,9 +211,9 @@ + "DLSW: Switch-to-Switch Protocol RFC 1795" + ::= { dlswNode 3 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- DLSw Code Capability +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswNodeStdPacingSupport OBJECT-TYPE + SYNTAX INTEGER { + none (1), -- does not support DLSw +@@ -238,9 +238,9 @@ + scheme but never varies its receive window size." + ::= { dlswNode 4 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- DLSw Node Operational Objects +--- ------------------------------------------------------------------- ++--==================================================================== + dlswNodeStatus OBJECT-TYPE + SYNTAX INTEGER { + active (1), +@@ -339,10 +339,10 @@ + -- TRANSPORT CONNECTION (aka: PARTNER DLSW) + -- ******************************************************************* + +--- ------------------------------------------------------------------- ++-- =================================================================== + + -- Transport Connection Statistics Objects +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswTConnStat OBJECT IDENTIFIER ::= { dlswTConn 1 } + + dlswTConnStatActiveConnections OBJECT-TYPE +@@ -375,9 +375,9 @@ + this means the transport connection failed unexpectedly." + ::= { dlswTConnStat 3 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Transport Connection Configuration Table +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswTConnConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF DlswTConnConfigEntry + MAX-ACCESS not-accessible +@@ -651,15 +651,15 @@ + row definition out of use." + ::= { dlswTConnConfigEntry 13 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Transport Connection Operation Table +--- ------------------------------------------------------------------- ++-- =================================================================== + -- (1) At most one transport connection can be connected between + -- this DLSw and one of its DLSw partners at a given time. + -- (2) Multiple transport types are supported. + -- (3) Since the entries may be reused, dlswTConnOperEntryTime + -- needs to be consulted for the possibility of counter reset. +--- ------------------------------------------------------------------- ++-- =================================================================== + + dlswTConnOperTable OBJECT-TYPE + SYNTAX SEQUENCE OF DlswTConnOperEntry +@@ -1254,14 +1254,14 @@ + connection, where `active' means not in `disconnected' state." + ::= { dlswTConnOperEntry 36 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Transport Connection Specific +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswTConnSpecific OBJECT IDENTIFIER ::= { dlswTConn 4 } + dlswTConnTcp OBJECT IDENTIFIER ::= { dlswTConnSpecific 1 } + + -- ................................................................... +--- TCP Transport Connection Specific -- Configuration ++-- TCP Transport Connection Specific - Configuration + -- ................................................................... + dlswTConnTcpConfigTable OBJECT-TYPE + SYNTAX SEQUENCE OF DlswTConnTcpConfigEntry +@@ -1328,7 +1328,7 @@ + ::= { dlswTConnTcpConfigEntry 3 } + + -- ................................................................... +--- TCP Transport Connection Specific -- Operation ++-- TCP Transport Connection Specific - Operation + -- ................................................................... + dlswTConnTcpOperTable OBJECT-TYPE + SYNTAX SEQUENCE OF DlswTConnTcpOperEntry +@@ -1472,9 +1472,9 @@ + -- transport address of the DLSw partner is cached. + -- ******************************************************************* + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Directory Related Statistical Objects +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswDirStat OBJECT IDENTIFIER ::= { dlswDirectory 1 } + + dlswDirMacEntries OBJECT-TYPE +@@ -1556,9 +1556,9 @@ + create new rows." + ::= { dlswDirStat 8 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Directory Cache +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswDirCache OBJECT IDENTIFIER ::= { dlswDirectory 2 } + + -- ................................................................... +@@ -1566,7 +1566,7 @@ + -- All Possible combinations of values of these objects. + -- + -- EntryType LocationType Location Status +--- -------------- ------------ ------------------ -------------- ++-- ============== ============ ================== ============== + -- userConfigured local ifEntry or 0.0 reachable, or + -- notReachable, or + -- unknown +@@ -1743,7 +1743,7 @@ + -- All Possible combinations of values of these objects. + -- + -- EntryType LocationType Location Status +--- -------------- ------------ ------------------ -------------- ++-- ============== ============ ================== ============== + -- userConfigured local ifEntry or 0.0 reachable, or + -- notReachable, or + -- unknown +@@ -1918,9 +1918,9 @@ + following the RowStatus textual convention." + ::= { dlswDirNBEntry 9 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Resource Locations +--- ------------------------------------------------------------------- ++-- =================================================================== + + dlswDirLocate OBJECT IDENTIFIER ::= { dlswDirectory 3 } + +@@ -2056,9 +2056,9 @@ + -- station that receives the initiation. + -- ******************************************************************* + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Statistics Related to Circuits +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswCircuitStat OBJECT IDENTIFIER ::= { dlswCircuit 1 } + + dlswCircuitStatActives OBJECT-TYPE +@@ -2079,7 +2079,7 @@ + or reactivated upon exiting `disconnected' state." + ::= { dlswCircuitStat 2 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- Circuit Table + -- + -- This table is the DLSw entity's view of circuits. There will be +@@ -2090,9 +2090,9 @@ + -- this Circuit Table: + -- + -- number of | Origin End Station Location +--- entries in the |-------------------------------------- ++-- entries in the |====================================== + -- Circuit Table | internal local remote +--- -----------------------|-------------------------------------- ++-- =======================|====================================== + -- Target | internal | NA 2 1 + -- End | local | 2 2 1 + -- Station | remote | 1 1 NA +@@ -2106,7 +2106,7 @@ + -- + -- Most of statistics related to circuits can be collected + -- from LLC-2 Link Station Table. +--- ------------------------------------------------------------------- ++-- =================================================================== + dlswCircuitTable OBJECT-TYPE + SYNTAX SEQUENCE OF DlswCircuitEntry + MAX-ACCESS not-accessible +@@ -2814,7 +2814,7 @@ + -- ******************************************************************* + dlswTraps OBJECT IDENTIFIER ::= { dlswMIB 0 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- This section defines the well-known notifications sent by + -- DLSW agents. + -- Care must be taken to insure that no particular notification +@@ -2827,7 +2827,7 @@ + -- (3) Transport connection up/down + + -- (4) Circuit up/down +--- ------------------------------------------------------------------- ++-- =================================================================== + -- + + dlswTrapTConnPartnerReject NOTIFICATION-TYPE +@@ -2902,9 +2902,9 @@ + dlswCompliances OBJECT IDENTIFIER ::= { dlswConformance 1 } + dlswGroups OBJECT IDENTIFIER ::= { dlswConformance 2 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- COMPLIANCE STATEMENTS +--- ------------------------------------------------------------------- ++-- =================================================================== + + -- ................................................................... + -- Core compliance for all DLSw entities +@@ -3245,9 +3245,9 @@ + "Write access is not required." + ::= { dlswCompliances 5 } + +--- ------------------------------------------------------------------- ++-- =================================================================== + -- CONFORMANCE GROUPS +--- ------------------------------------------------------------------- ++-- =================================================================== + + -- ................................................................... + -- Node Conformance Group +diff -ru /usr/local/share/snmp/rfc.orig/DSA-MIB /usr/local/share/snmp/rfc/DSA-MIB +--- /usr/local/share/snmp/rfc.orig/DSA-MIB Sat Mar 3 17:15:36 2001 ++++ /usr/local/share/snmp/rfc/DSA-MIB Thu Feb 22 00:33:45 2001 +@@ -10,7 +10,7 @@ + mib-2 + FROM RFC1213-MIB + applIndex, DistinguishedName +- FROM APPLICATION-MIB; ++ FROM NETWORK-SERVICES-MIB; + + dsaMIB MODULE-IDENTITY + LAST-UPDATED "9311250000Z" +diff -ru /usr/local/share/snmp/rfc.orig/FDDI-SMT73-MIB /usr/local/share/snmp/rfc/FDDI-SMT73-MIB +--- /usr/local/share/snmp/rfc.orig/FDDI-SMT73-MIB Sat Mar 3 17:15:09 2001 ++++ /usr/local/share/snmp/rfc/FDDI-SMT73-MIB Tue Jan 23 00:11:46 2001 +@@ -3,6 +3,8 @@ + IMPORTS + Counter + FROM RFC1155-SMI ++ transmission ++ FROM RFC1213-MIB + OBJECT-TYPE + FROM RFC-1212; + +diff -ru /usr/local/share/snmp/rfc.orig/HPR-MIB /usr/local/share/snmp/rfc/HPR-MIB +--- /usr/local/share/snmp/rfc.orig/HPR-MIB Sat Mar 3 17:19:54 2001 ++++ /usr/local/share/snmp/rfc/HPR-MIB Tue Jan 23 00:25:54 2001 +@@ -18,7 +18,7 @@ + FROM APPN-MIB; + + hprMIB MODULE-IDENTITY +- LAST-UPDATED "970514000000Z" ++ LAST-UPDATED "9705140000Z" + ORGANIZATION "AIW APPN / HPR MIB SIG" + CONTACT-INFO + " +diff -ru /usr/local/share/snmp/rfc.orig/MIP-MIB /usr/local/share/snmp/rfc/MIP-MIB +--- /usr/local/share/snmp/rfc.orig/MIP-MIB Sat Mar 3 17:17:42 2001 ++++ /usr/local/share/snmp/rfc/MIP-MIB Tue Jan 23 00:25:27 2001 +@@ -1,7 +1,7 @@ + MIP-MIB DEFINITIONS ::= BEGIN + + IMPORTS +- Counter32, Gauge32, Integer32, IpAddress, experimental, ++ Counter32, Gauge32, Integer32, IpAddress, mib-2, + MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE + FROM SNMPv2-SMI + RowStatus, TruthValue, TimeStamp, +@@ -2117,7 +2117,7 @@ + function within a home agent." + ::= { mipGroups 12 } + +- mipSecNotifcationsGroup NOTIFICATION-GROUP ++ mipSecNotificationsGroup NOTIFICATION-GROUP + NOTIFICATIONS { mipAuthFailure } + STATUS current + DESCRIPTION +diff -ru /usr/local/share/snmp/rfc.orig/Modem-MIB /usr/local/share/snmp/rfc/Modem-MIB +--- /usr/local/share/snmp/rfc.orig/Modem-MIB Sat Mar 3 17:16:35 2001 ++++ /usr/local/share/snmp/rfc/Modem-MIB Mon Jan 22 23:53:08 2001 +@@ -23,7 +23,7 @@ + E-mail: waldbusser@cmu.edu" + DESCRIPTION + "The MIB module for management of dial-up modems." +- ::= { mdmMIB 1 } ++ ::= { mdmMib 1 } + + mdmMib OBJECT IDENTIFIER ::= { mib-2 38 } + +diff -ru /usr/local/share/snmp/rfc.orig/PPP-LCP-MIB /usr/local/share/snmp/rfc/PPP-LCP-MIB +--- /usr/local/share/snmp/rfc.orig/PPP-LCP-MIB Sat Mar 3 17:14:46 2001 ++++ /usr/local/share/snmp/rfc/PPP-LCP-MIB Sat Mar 3 23:13:27 2001 +@@ -182,7 +182,7 @@ + ::= { pppLinkStatusEntry 5 } + + pppLinkStatusLocalMRU OBJECT-TYPE +- SYNTAX INTEGER(1..2147483648) ++ SYNTAX INTEGER(1..2147483647) + ACCESS read-only + STATUS mandatory + DESCRIPTION +@@ -195,7 +195,7 @@ + ::= { pppLinkStatusEntry 6 } + + pppLinkStatusRemoteMRU OBJECT-TYPE +- SYNTAX INTEGER(1..2147483648) ++ SYNTAX INTEGER(1..2147483647) + ACCESS read-only + STATUS mandatory + DESCRIPTION +@@ -535,7 +535,7 @@ + ::= { pppLqrEntry 2 } + + pppLqrLocalPeriod OBJECT-TYPE +- SYNTAX INTEGER(1..2147483648) ++ SYNTAX INTEGER(1..2147483647) + ACCESS read-only + STATUS mandatory + DESCRIPTION +@@ -548,7 +548,7 @@ + ::= { pppLqrEntry 3 } + + pppLqrRemotePeriod OBJECT-TYPE +- SYNTAX INTEGER(1..2147483648) ++ SYNTAX INTEGER(1..2147483647) + ACCESS read-only + STATUS mandatory + DESCRIPTION +diff -ru /usr/local/share/snmp/rfc.orig/RDBMS-MIB /usr/local/share/snmp/rfc/RDBMS-MIB +--- /usr/local/share/snmp/rfc.orig/RDBMS-MIB Sat Mar 3 17:16:41 2001 ++++ /usr/local/share/snmp/rfc/RDBMS-MIB Tue Jan 23 00:24:04 2001 +@@ -6,8 +6,8 @@ + FROM SNMPv2-SMI + DisplayString, DateAndTime, AutonomousType + FROM SNMPv2-TC +- applIndex, applGroup +- FROM APPLICATION-MIB ++ applIndex, applGroups ++ FROM NETWORK-SERVICES-MIB + mib-2 + FROM RFC1213-MIB; + +@@ -1263,8 +1263,8 @@ + implement the RDBMS MIB" + MODULE HOST-RESOURCES-MIB + MANDATORY-GROUPS { hrSystem } +- MODULE APPLICATION-MIB +- MANDATORY-GROUPS { applGroup } ++ MODULE NETWORK-SERVICES-MIB ++ MANDATORY-GROUPS { applGroups } + MODULE RDBMS-MIB + MANDATORY-GROUPS { rdbmsGroup } + +Only in /usr/local/share/snmp/rfc: RFC-1215 +diff -ru /usr/local/share/snmp/rfc.orig/RFC1414-MIB /usr/local/share/snmp/rfc/RFC1414-MIB +--- /usr/local/share/snmp/rfc.orig/RFC1414-MIB Sat Mar 3 17:14:37 2001 ++++ /usr/local/share/snmp/rfc/RFC1414-MIB Tue Feb 20 00:25:21 2001 +@@ -3,6 +3,7 @@ + IMPORTS + OBJECT-TYPE + FROM RFC-1212 ++ mib-2, + tcpConnLocalAddress, tcpConnLocalPort, + tcpConnRemAddress, tcpConnRemPort + FROM RFC1213-MIB; +diff -ru /usr/local/share/snmp/rfc.orig/SNA-NAU-MIB /usr/local/share/snmp/rfc/SNA-NAU-MIB +--- /usr/local/share/snmp/rfc.orig/SNA-NAU-MIB Sat Mar 3 17:16:24 2001 ++++ /usr/local/share/snmp/rfc/SNA-NAU-MIB Mon Jan 22 23:57:44 2001 +@@ -17,7 +17,7 @@ + DisplayString, RowStatus, TimeStamp, InstancePointer + FROM SNMPv2-TC + +- Counter32, Gauge32, Integer32, ++ Counter32, Gauge32, Integer32, mib-2, + OBJECT-TYPE, MODULE-IDENTITY, NOTIFICATION-TYPE + FROM SNMPv2-SMI + +diff -ru /usr/local/share/snmp/rfc.orig/TCPIPX-MIB /usr/local/share/snmp/rfc/TCPIPX-MIB +--- /usr/local/share/snmp/rfc.orig/TCPIPX-MIB Sat Mar 3 17:17:17 2001 ++++ /usr/local/share/snmp/rfc/TCPIPX-MIB Sat Mar 3 16:51:11 2001 +@@ -1,6 +1,8 @@ + TCPIPX-MIB DEFINITIONS ::= BEGIN + + IMPORTS ++ enterprises ++ FROM RFC1155-SMI + OBJECT-TYPE + FROM RFC-1212; + +@@ -10,7 +12,7 @@ + + -- as hex digits, as in: nnnnnnnn:mmmmmmmmmmmm + +-IpxAddress ::= OCTET STRING (size (10)) ++IpxAddress ::= OCTET STRING (SIZE (10)) + + -- TCP/IPX MIB object idenfifiers + +diff -ru /usr/local/share/snmp/rfc.orig/UPS-MIB /usr/local/share/snmp/rfc/UPS-MIB +--- /usr/local/share/snmp/rfc.orig/UPS-MIB Sat Mar 3 17:16:01 2001 ++++ /usr/local/share/snmp/rfc/UPS-MIB Mon Jan 22 23:55:45 2001 +@@ -2,7 +2,7 @@ + + IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, +- OBJECT-IDENTITY, Counter32, Gauge32, Integer32 ++ OBJECT-IDENTITY, Counter32, Gauge32, Integer32, mib-2 + FROM SNMPv2-SMI + DisplayString, TimeStamp, TimeInterval, TestAndIncr, + AutonomousType +diff -ru /usr/local/share/snmp/rfc.orig/SMUX-MIB /usr/local/share/snmp/rfc/SMUX-MIB +--- /usr/local/share/snmp/rfc.orig/SMUX-MIB 2002-06-15 15:31:22.000000000 +0200 ++++ /usr/local/share/snmp/rfc/SMUX-MIB 2002-06-15 15:31:22.000000000 +0200 +@@ -3,6 +3,8 @@ + IMPORTS + enterprises + FROM RFC1155-SMI ++ DisplayString ++ FROM RFC1213-MIB + OBJECT-TYPE + FROM RFC1212; + +@@ -120,7 +122,7 @@ + ::= { smuxTreeEntry 1 } + + smuxTpriority OBJECT-TYPE +- SYNTAX INTEGER (0..'07fffffff'h) ++ SYNTAX INTEGER (0..'7fffffff'h) + ACCESS read-only + STATUS mandatory + DESCRIPTION +--- /usr/local/share/snmp/rfc.orig/IPATM-IPMC-MIB 2016-08-31 18:15:12.119765771 +0200 ++++ /usr/local/share/snmp/rfc/IPATM-IPMC-MIB 2016-08-31 18:15:37.055739853 +0200 +@@ -3,7 +3,7 @@ + IMPORTS + MODULE-COMPLIANCE, NOTIFICATION-GROUP, OBJECT-GROUP + FROM SNMPv2-CONF +- snmpModules, MODULE-IDENTITY, NOTIFICATION-TYPE, Counter32, ++ mib-2, MODULE-IDENTITY, NOTIFICATION-TYPE, Counter32, + Integer32, Unsigned32, OBJECT-TYPE, IpAddress + FROM SNMPv2-SMI + AtmAddr diff --git a/snmp-mibs-downloader/simplelist b/snmp-mibs-downloader/simplelist new file mode 100644 index 0000000..85748da --- /dev/null +++ b/snmp-mibs-downloader/simplelist @@ -0,0 +1,2 @@ +RFC-1212 RFC-1212 +RFC-1215 RFC-1215 diff --git a/snmp-mibs-downloader/simpleweb.conf b/snmp-mibs-downloader/simpleweb.conf new file mode 100644 index 0000000..8b8f4a3 --- /dev/null +++ b/snmp-mibs-downloader/simpleweb.conf @@ -0,0 +1,7 @@ +# Configuarions for RFC-1212 and RFC-1215 MIBs download from simpleweb.org +# + +HOST=http://www.simpleweb.org +DIR=ietf/mibs/modules/IETF/txt +CONF=simplelist +DEST=ietf diff --git a/snmp-mibs-downloader/snmp-mibs-downloader.conf b/snmp-mibs-downloader/snmp-mibs-downloader.conf new file mode 100644 index 0000000..9213273 --- /dev/null +++ b/snmp-mibs-downloader/snmp-mibs-downloader.conf @@ -0,0 +1,4 @@ +# Master configuarion for mib-downloader +# +BASEDIR=/var/lib/snmp/mibs +AUTOLOAD="rfc ianarfc iana" diff --git a/wireshark/init.lua b/wireshark/init.lua new file mode 100644 index 0000000..91c0d10 --- /dev/null +++ b/wireshark/init.lua @@ -0,0 +1,703 @@ +-- init.lua +-- +-- initialize wireshark's lua +-- +-- This file is going to be executed before any other lua script. +-- It can be used to load libraries, disable functions and more. +-- +-- Wireshark - Network traffic analyzer +-- By Gerald Combs +-- Copyright 1998 Gerald Combs +-- +-- SPDX-License-Identifier: GPL-2.0-or-later + +-- Set disable_lua to true to disable Lua support. +disable_lua = false + +if disable_lua then + return +end + +-- If set and we are running with special privileges this setting +-- tells whether scripts other than this one are to be run. +run_user_scripts_when_superuser = false + + +-- disable potentialy harmful lua functions when running superuser +if running_superuser then + local hint = "has been disabled due to running Wireshark as superuser. See https://wiki.wireshark.org/CaptureSetup/CapturePrivileges for help in running Wireshark as an unprivileged user." + local disabled_lib = {} + setmetatable(disabled_lib,{ __index = function() error("this package ".. hint) end } ); + + dofile = function() error("dofile " .. hint) end + loadfile = function() error("loadfile " .. hint) end + loadlib = function() error("loadlib " .. hint) end + require = function() error("require " .. hint) end + os = disabled_lib + io = disabled_lib + file = disabled_lib +end + +-- to avoid output to stdout which can cause problems lua's print () +-- has been suppresed so that it yields an error. +-- have print() call info() instead. +if gui_enabled() then + print = info +end + +function typeof(obj) + local mt = getmetatable(obj) + return mt and mt.__typeof or obj.__typeof or type(obj) +end + +-- the following function checks if a file exists +-- since 1.11.3 +function file_exists(name) + local f = io.open(name,"r") + if f ~= nil then io.close(f) return true else return false end +end + +-- the following function prepends the given directory name to +-- the package.path, so that a 'require "foo"' will work if 'foo' +-- is in the directory name given to this function. For example, +-- if your Lua file will do a 'require "foo"' and the foo.lua +-- file is in a local directory (local to your script) named 'bar', +-- then call this function before doing your 'require', by doing +-- package.prepend_path("bar") +-- and that will let Wireshark's Lua find the file "bar/foo.lua" +-- when you later do 'require "foo"' +-- +-- Because this function resides here in init.lua, it does not +-- have the same environment as your script, so it has to get it +-- using the debug library, which is why the code appears so +-- cumbersome. +-- +-- since 1.11.3 +function package.prepend_path(name) + local debug = require "debug" + -- get the function calling this package.prepend_path function + local dt = debug.getinfo(2, "f") + if not dt then + error("could not retrieve debug info table") + end + -- get its upvalue + local _, val = debug.getupvalue(dt.func, 1) + if not val or type(val) ~= 'table' then + error("No calling function upvalue or it is not a table") + end + -- get the __DIR__ field in its upvalue table + local dir = val["__DIR__"] + -- get the platform-specific directory separator character + local sep = package.config:sub(1,1) + -- prepend the dir and given name to path + if dir and dir:len() > 0 then + package.path = dir .. sep .. name .. sep .. "?.lua;" .. package.path + end + -- also prepend just the name as a directory + package.path = name .. sep .. "?.lua;" .. package.path +end + +-- Wiretap encapsulations XXX +wtap_encaps = { + ["PER_PACKET"] = -1, + ["UNKNOWN"] = 0, + ["ETHERNET"] = 1, + ["TOKEN_RING"] = 2, + ["SLIP"] = 3, + ["PPP"] = 4, + ["FDDI"] = 5, + ["FDDI_BITSWAPPED"] = 6, + ["RAW_IP"] = 7, + ["ARCNET"] = 8, + ["ARCNET_LINUX"] = 9, + ["ATM_RFC1483"] = 10, + ["LINUX_ATM_CLIP"] = 11, + ["LAPB"] = 12, + ["ATM_PDUS"] = 13, + ["ATM_PDUS_UNTRUNCATED"] = 14, + ["NULL"] = 15, + ["ASCEND"] = 16, + ["ISDN"] = 17, + ["IP_OVER_FC"] = 18, + ["PPP_WITH_PHDR"] = 19, + ["IEEE_802_11"] = 20, + ["IEEE_802_11_PRISM"] = 21, + ["IEEE_802_11_WITH_RADIO"] = 22, + ["IEEE_802_11_RADIOTAP"] = 23, + ["IEEE_802_11_AVS"] = 24, + ["SLL"] = 25, + ["FRELAY"] = 26, + ["FRELAY_WITH_PHDR"] = 27, + ["CHDLC"] = 28, + ["CISCO_IOS"] = 29, + ["LOCALTALK"] = 30, + ["OLD_PFLOG"] = 31, + ["HHDLC"] = 32, + ["DOCSIS"] = 33, + ["COSINE"] = 34, + ["WFLEET_HDLC"] = 35, + ["SDLC"] = 36, + ["TZSP"] = 37, + ["ENC"] = 38, + ["PFLOG"] = 39, + ["CHDLC_WITH_PHDR"] = 40, + ["BLUETOOTH_H4"] = 41, + ["MTP2"] = 42, + ["MTP3"] = 43, + ["IRDA"] = 44, + ["USER0"] = 45, + ["USER1"] = 46, + ["USER2"] = 47, + ["USER3"] = 48, + ["USER4"] = 49, + ["USER5"] = 50, + ["USER6"] = 51, + ["USER7"] = 52, + ["USER8"] = 53, + ["USER9"] = 54, + ["USER10"] = 55, + ["USER11"] = 56, + ["USER12"] = 57, + ["USER13"] = 58, + ["USER14"] = 59, + ["USER15"] = 60, + ["SYMANTEC"] = 61, + ["APPLE_IP_OVER_IEEE1394"] = 62, + ["BACNET_MS_TP"] = 63, + ["NETTL_RAW_ICMP"] = 64, + ["NETTL_RAW_ICMPV6"] = 65, + ["GPRS_LLC"] = 66, + ["JUNIPER_ATM1"] = 67, + ["JUNIPER_ATM2"] = 68, + ["REDBACK"] = 69, + ["NETTL_RAW_IP"] = 70, + ["NETTL_ETHERNET"] = 71, + ["NETTL_TOKEN_RING"] = 72, + ["NETTL_FDDI"] = 73, + ["NETTL_UNKNOWN"] = 74, + ["MTP2_WITH_PHDR"] = 75, + ["JUNIPER_PPPOE"] = 76, + ["GCOM_TIE1"] = 77, + ["GCOM_SERIAL"] = 78, + ["NETTL_X25"] = 79, + ["K12"] = 80, + ["JUNIPER_MLPPP"] = 81, + ["JUNIPER_MLFR"] = 82, + ["JUNIPER_ETHER"] = 83, + ["JUNIPER_PPP"] = 84, + ["JUNIPER_FRELAY"] = 85, + ["JUNIPER_CHDLC"] = 86, + ["JUNIPER_GGSN"] = 87, + ["LINUX_LAPD"] = 88, + ["CATAPULT_DCT2000"] = 89, + ["BER"] = 90, + ["JUNIPER_VP"] = 91, + ["USB_FREEBSD"] = 92, + ["IEEE802_16_MAC_CPS"] = 93, + ["NETTL_RAW_TELNET"] = 94, + ["USB_LINUX"] = 95, + ["MPEG"] = 96, + ["PPI"] = 97, + ["ERF"] = 98, + ["BLUETOOTH_H4_WITH_PHDR"] = 99, + ["SITA"] = 100, + ["SCCP"] = 101, + ["BLUETOOTH_HCI"] = 102, + ["IPMB"] = 103, + ["IEEE802_15_4"] = 104, + ["X2E_XORAYA"] = 105, + ["FLEXRAY"] = 106, + ["LIN"] = 107, + ["MOST"] = 108, + ["CAN20B"] = 109, + ["LAYER1_EVENT"] = 110, + ["X2E_SERIAL"] = 111, + ["I2C"] = 112, + ["IEEE802_15_4_NONASK_PHY"] = 113, + ["TNEF"] = 114, + ["USB_LINUX_MMAPPED"] = 115, + ["GSM_UM"] = 116, + ["DPNSS"] = 117, + ["PACKETLOGGER"] = 118, + ["NSTRACE_1_0"] = 119, + ["NSTRACE_2_0"] = 120, + ["FIBRE_CHANNEL_FC2"] = 121, + ["FIBRE_CHANNEL_FC2_WITH_FRAME_DELIMS"] = 122, + ["JPEG_JFIF"] = 123, + ["IPNET"] = 124, + ["SOCKETCAN"] = 125, + ["IEEE_802_11_NETMON"] = 126, + ["IEEE802_15_4_NOFCS"] = 127, + ["RAW_IPFIX"] = 128, + ["RAW_IP4"] = 129, + ["RAW_IP6"] = 130, + ["LAPD"] = 131, + ["DVBCI"] = 132, + ["MUX27010"] = 133, + ["MIME"] = 134, + ["NETANALYZER"] = 135, + ["NETANALYZER_TRANSPARENT"] = 136, + ["IP_OVER_IB_SNOOP"] = 137, + ["MPEG_2_TS"] = 138, + ["PPP_ETHER"] = 139, + ["NFC_LLCP"] = 140, + ["NFLOG"] = 141, + ["V5_EF"] = 142, + ["BACNET_MS_TP_WITH_PHDR"] = 143, + ["IXVERIWAVE"] = 144, + ["SDH"] = 145, + ["DBUS"] = 146, + ["AX25_KISS"] = 147, + ["AX25"] = 148, + ["SCTP"] = 149, + ["INFINIBAND"] = 150, + ["JUNIPER_SVCS"] = 151, + ["USBPCAP"] = 152, + ["RTAC_SERIAL"] = 153, + ["BLUETOOTH_LE_LL"] = 154, + ["WIRESHARK_UPPER_PDU"] = 155, + ["STANAG_4607"] = 156, + ["STANAG_5066_D_PDU"] = 157, + ["NETLINK"] = 158, + ["BLUETOOTH_LINUX_MONITOR"] = 159, + ["BLUETOOTH_BREDR_BB"] = 160, + ["BLUETOOTH_LE_LL_WITH_PHDR"] = 161, + ["NSTRACE_3_0"] = 162, + ["LOGCAT"] = 163, + ["LOGCAT_BRIEF"] = 164, + ["LOGCAT_PROCESS"] = 165, + ["LOGCAT_TAG"] = 166, + ["LOGCAT_THREAD"] = 167, + ["LOGCAT_TIME"] = 168, + ["LOGCAT_THREADTIME"] = 169, + ["LOGCAT_LONG"] = 170, + ["PKTAP"] = 171, + ["EPON"] = 172, + ["IPMI_TRACE"] = 173, + ["LOOP"] = 174, + ["JSON"] = 175, + ["NSTRACE_3_5"] = 176, + ["ISO14443"] = 177, + ["GFP_T"] = 178, + ["GFP_F"] = 179, + ["IP_OVER_IB_PCAP"] = 180, + ["JUNIPER_VN"] = 181, + ["USB_DARWIN"] = 182, + ["LORATAP"] = 183, + ["3MB_ETHERNET"] = 184, + ["VSOCK"] = 185, + ["NORDIC_BLE"] = 186, + ["NETMON_NET_NETEVENT"] = 187, + ["NETMON_HEADER"] = 188, + ["NETMON_NET_FILTER"] = 189, + ["NETMON_NETWORK_INFO_EX"] = 190, + ["MA_WFP_CAPTURE_V4"] = 191, + ["MA_WFP_CAPTURE_V6"] = 192, + ["MA_WFP_CAPTURE_2V4"] = 193, + ["MA_WFP_CAPTURE_2V6"] = 194, + ["MA_WFP_CAPTURE_AUTH_V4"] = 195, + ["MA_WFP_CAPTURE_AUTH_V6"] = 196, + ["JUNIPER_ST"] = 197, + ["ETHERNET_MPACKET"] = 198, + ["DOCSIS31_XRA31"] = 199 +} +wtap = wtap_encaps -- for bw compatibility + + +-- Wiretap file types +wtap_filetypes = { + ["UNKNOWN"] = 0, + ["PCAP"] = 1, + ["PCAPNG"] = 2, + ["PCAP_NSEC"] = 3, + ["PCAP_AIX"] = 4, + ["PCAP_SS991029"] = 5, + ["PCAP_NOKIA"] = 6, + ["PCAP_SS990417"] = 7, + ["PCAP_SS990915"] = 8, + ["5VIEWS"] = 9, + ["IPTRACE_1_0"] = 10, + ["IPTRACE_2_0"] = 11, + ["BER"] = 12, + ["HCIDUMP"] = 13, + ["CATAPULT_DCT2000"] = 14, + ["NETXRAY_OLD"] = 15, + ["NETXRAY_1_0"] = 16, + ["COSINE"] = 17, + ["CSIDS"] = 18, + ["DBS_ETHERWATCH"] = 19, + ["ERF"] = 20, + ["EYESDN"] = 21, + ["NETTL"] = 22, + ["ISERIES"] = 23, + ["ISERIES_UNICODE"] = 24, + ["I4BTRACE"] = 25, + ["ASCEND"] = 26, + ["NGSNIFFER_UNCOMPRESSED"] = 29, + ["NGSNIFFER_COMPRESSED"] = 30, + ["NETXRAY_1_1"] = 31, + ["NETWORK_INSTRUMENTS"] = 33, + ["LANALYZER"] = 34, + ["PPPDUMP"] = 35, + ["RADCOM"] = 36, + ["SNOOP"] = 37, + ["SHOMITI"] = 38, + ["VMS"] = 39, + ["K12"] = 40, + ["TOSHIBA"] = 41, + ["VISUAL_NETWORKS"] = 42, + ["PEEKCLASSIC_V56"] = 43, + ["PEEKCLASSIC_V7"] = 44, + ["PEEKTAGGED"] = 45, + ["MPEG"] = 46, + ["K12TEXT"] = 47, + ["NETSCREEN"] = 48, + ["COMMVIEW"] = 49, + ["BTSNOOP"] = 50, + ["TNEF"] = 51, + ["DCT3TRACE"] = 52, + ["PACKETLOGGER"] = 53, + ["DAINTREE_SNA"] = 54, + ["NETSCALER_1_0"] = 55, + ["NETSCALER_2_0"] = 56, + ["JPEG_JFIF"] = 57, + ["IPFIX"] = 58, + ["MIME"] = 59, + ["AETHRA"] = 60, + ["MPEG_2_TS"] = 61, + ["VWR_80211"] = 62, + ["VWR_ETH"] = 63, + ["CAMINS"] = 64, + ["STANAG_4607"] = 65, + ["NETSCALER_3_0"] = 66, + ["LOGCAT"] = 67, + ["LOGCAT_BRIEF"] = 68, + ["LOGCAT_PROCESS"] = 69, + ["LOGCAT_TAG"] = 70, + ["LOGCAT_THREAD"] = 71, + ["LOGCAT_TIME"] = 72, + ["LOGCAT_THREADTIME"] = 73, + ["LOGCAT_LONG"] = 74, + ["COLASOFT_CAPSA"] = 75, + ["COLASOFT_PACKET_BUILDER"] = 76, + ["JSON"] = 77, + ["NETSCALER_3_5"] = 78, + ["NETTRACE_3GPP_32_423"] = 79, + ["MPLOG"] = 80, + ["TSPREC_SEC"] = 0, + ["TSPREC_DSEC"] = 1, + ["TSPREC_CSEC"] = 2, + ["TSPREC_MSEC"] = 3, + ["TSPREC_USEC"] = 6, + ["TSPREC_NSEC"] = 9 +} + + +-- Wiretap timestamp precision types +wtap_tsprecs = { + ["SEC"] = 0, + ["DSEC"] = 1, + ["CSEC"] = 2, + ["MSEC"] = 3, + ["USEC"] = 6, + ["NSEC"] = 9 +} + + +-- Wiretap file comment types +wtap_comments = { + ["PER_SECTION"] = 0x00000001, + ["PER_INTERFACE"] = 0x00000002, + ["PER_PACKET"] = 0x00000004 +} + + +-- Field Types +ftypes = { + ["NONE"] = 0, + ["PROTOCOL"] = 1, + ["BOOLEAN"] = 2, + ["CHAR"] = 3, + ["UINT8"] = 4, + ["UINT16"] = 5, + ["UINT24"] = 6, + ["UINT32"] = 7, + ["UINT40"] = 8, + ["UINT48"] = 9, + ["UINT56"] = 10, + ["UINT64"] = 11, + ["INT8"] = 12, + ["INT16"] = 13, + ["INT24"] = 14, + ["INT32"] = 15, + ["INT40"] = 16, + ["INT48"] = 17, + ["INT56"] = 18, + ["INT64"] = 19, + ["IEEE_11073_SFLOAT"] = 20, + ["IEEE_11073_FLOAT"] = 21, + ["FLOAT"] = 22, + ["DOUBLE"] = 23, + ["ABSOLUTE_TIME"] = 24, + ["RELATIVE_TIME"] = 25, + ["STRING"] = 26, + ["STRINGZ"] = 27, + ["UINT_STRING"] = 28, + ["ETHER"] = 29, + ["BYTES"] = 30, + ["UINT_BYTES"] = 31, + ["IPv4"] = 32, + ["IPv6"] = 33, + ["IPXNET"] = 34, + ["FRAMENUM"] = 35, + ["PCRE"] = 36, + ["GUID"] = 37, + ["OID"] = 38, + ["EUI64"] = 39, + ["AX25"] = 40, + ["VINES"] = 41, + ["REL_OID"] = 42, + ["SYSTEM_ID"] = 43, + ["STRINGZPAD"] = 44, + ["FCWWN"] = 45 +} + + +-- the following table is since 2.0 +-- Field Type FRAMENUM Types +frametype = { + ["NONE"] = 0, + ["REQUEST"] = 1, + ["RESPONSE"] = 2, + ["ACK"] = 3, + ["DUP_ACK"] = 4, + ["RETRANS_PREV"] = 5, + ["RETRANS_NEXT"] = 6 +} + + +-- the following table is since 1.12 +-- Wiretap record_types +wtap_rec_types = { + ["PACKET"] = 0, -- packet + ["FT_SPECIFIC_EVENT"] = 1, -- file-type-specific event + ["FT_SPECIFIC_REPORT"] = 2, -- file-type-specific report + ["SYSCALL"] = 3, -- system call +} + + +-- the following table is since 1.11.3 +-- Wiretap presence flags +wtap_presence_flags = { + ["TS"] = 1, -- time stamp + ["CAP_LEN"] = 2, -- captured length separate from on-the-network length + ["INTERFACE_ID"] = 4, -- interface ID + ["COMMENTS"] = 8, -- comments + ["DROP_COUNT"] = 16, -- drop count + ["PACK_FLAGS"] = 32, -- packet flags +} + + +-- Display Bases +base = { + ["NONE"] = 0, -- none + ["DEC"] = 1, -- decimal + ["HEX"] = 2, -- hexadecimal + ["OCT"] = 3, -- octal + ["DEC_HEX"] = 4, -- decimal (hexadecimal) + ["HEX_DEC"] = 5, -- hexadecimal (decimal) + ["CUSTOM"] = 6, -- call custom routine (in ->strings) to format + ["ASCII"] = 0, -- shows non-printable ASCII characters as C-style escapes + ["UNICODE"] = 7, -- shows non-printable UNICODE characters as \\uXXXX (XXX for now non-printable characters display depends on UI) + ["DOT"] = 8, -- hexadecimal bytes with a period (.) between each byte + ["DASH"] = 9, -- hexadecimal bytes with a dash (-) between each byte + ["COLON"] = 10, -- hexadecimal bytes with a colon (:) between each byte + ["SPACE"] = 11, -- hexadecimal bytes with a space between each byte + ["NETMASK"] = 12, -- Used for IPv4 address that shouldn't be resolved (like for netmasks) + ["PT_UDP"] = 13, -- UDP port + ["PT_TCP"] = 14, -- TCP port + ["PT_DCCP"] = 15, -- DCCP port + ["PT_SCTP"] = 16, -- SCTP port + ["OUI"] = 17, -- OUI resolution + ["UNIT_STRING"] = 4096, -- Add unit text to the field value + ["LOCAL"] = 1000, -- local time in our time zone, with month and day + ["UTC"] = 1001, -- UTC, with month and day + ["DOY_UTC"] = 1002, -- UTC, with 1-origin day-of-year +} + + +-- Encodings +ENC_BIG_ENDIAN = 0 +ENC_LITTLE_ENDIAN = 2147483648 +ENC_TIME_TIMESPEC = 0 +ENC_TIME_NTP = 2 +ENC_TIME_TOD = 4 +ENC_TIME_RTPS = 8 +ENC_TIME_NTP_BASE_ZERO = 14 +ENC_TIME_TIMEVAL = 16 +ENC_TIME_SECS = 18 +ENC_TIME_MSECS = 20 +ENC_TIME_SECS_NTP = 24 +ENC_TIME_RFC_3971 = 32 +ENC_TIME_MSEC_NTP = 34 +ENC_CHARENCODING_MASK = 2147483646 +ENC_ASCII = 0 +ENC_UTF_8 = 2 +ENC_UTF_16 = 4 +ENC_UCS_2 = 6 +ENC_UCS_4 = 8 +ENC_ISO_8859_1 = 10 +ENC_ISO_8859_2 = 12 +ENC_ISO_8859_3 = 14 +ENC_ISO_8859_4 = 16 +ENC_ISO_8859_5 = 18 +ENC_ISO_8859_6 = 20 +ENC_ISO_8859_7 = 22 +ENC_ISO_8859_8 = 24 +ENC_ISO_8859_9 = 26 +ENC_ISO_8859_10 = 28 +ENC_ISO_8859_11 = 30 +ENC_ISO_8859_13 = 34 +ENC_ISO_8859_14 = 36 +ENC_ISO_8859_15 = 38 +ENC_ISO_8859_16 = 40 +ENC_WINDOWS_1250 = 42 +ENC_3GPP_TS_23_038_7BITS = 44 +ENC_EBCDIC = 46 +ENC_MAC_ROMAN = 48 +ENC_CP437 = 50 +ENC_ASCII_7BITS = 52 +ENC_T61 = 54 +ENC_EBCDIC_CP037 = 56 +ENC_ZIGBEE = 58 +ENC_NA = 0 +ENC_STR_NUM = 16777216 +ENC_STR_HEX = 33554432 +ENC_STRING = 50331648 +ENC_STR_MASK = 65534 +ENC_NUM_PREF = 2097152 +ENC_VARINT_PROTOBUF = 2 +ENC_VARINT_QUIC = 4 +ENC_SEP_NONE = 65536 +ENC_SEP_COLON = 131072 +ENC_SEP_DASH = 262144 +ENC_SEP_DOT = 524288 +ENC_SEP_SPACE = 1048576 +ENC_SEP_MASK = 2031616 +ENC_ISO_8601_DATE = 65536 +ENC_ISO_8601_TIME = 131072 +ENC_ISO_8601_DATE_TIME = 196608 +ENC_RFC_822 = 262144 +ENC_RFC_1123 = 524288 +ENC_STR_TIME_MASK = 983040 + + + +-- Expert flags and facilities (deprecated - see 'expert' table below) +PI_SEVERITY_MASK = 15728640 +PI_COMMENT = 1048576 +PI_CHAT = 2097152 +PI_NOTE = 4194304 +PI_WARN = 6291456 +PI_ERROR = 8388608 +PI_GROUP_MASK = 4278190080 +PI_CHECKSUM = 16777216 +PI_SEQUENCE = 33554432 +PI_RESPONSE_CODE = 50331648 +PI_REQUEST_CODE = 67108864 +PI_UNDECODED = 83886080 +PI_REASSEMBLE = 100663296 +PI_MALFORMED = 117440512 +PI_DEBUG = 134217728 +PI_PROTOCOL = 150994944 +PI_SECURITY = 167772160 +PI_COMMENTS_GROUP = 184549376 +PI_DECRYPTION = 201326592 +PI_ASSUMPTION = 218103808 +PI_DEPRECATED = 234881024 + + + +-- the following table is since 1.11.3 +-- Expert flags and facilities +expert = { + -- Expert event groups + group = { + -- The protocol field has a bad checksum, usually uses PI_WARN severity + ["CHECKSUM"] = 16777216, + -- The protocol field indicates a sequence problem (e.g. TCP window is zero) + ["SEQUENCE"] = 33554432, + -- The protocol field indicates a bad application response code (e.g. HTTP 404), usually PI_NOTE severity + ["RESPONSE_CODE"] = 50331648, + -- The protocol field indicates an application request (e.g. File Handle == xxxx), usually PI_CHAT severity + ["REQUEST_CODE"] = 67108864, + -- The data is undecoded, the protocol dissection is incomplete here, usually PI_WARN severity + ["UNDECODED"] = 83886080, + -- The protocol field indicates a reassemble (e.g. DCE/RPC defragmentation), usually PI_CHAT severity (or PI_ERROR) + ["REASSEMBLE"] = 100663296, + -- The packet data is malformed, the dissector has "given up", usually PI_ERROR severity + ["MALFORMED"] = 117440512, + -- A generic debugging message (shouldn't remain in production code!), usually PI_ERROR severity + ["DEBUG"] = 134217728, + -- The protocol field violates a protocol specification, usually PI_WARN severity + ["PROTOCOL"] = 150994944, + -- The protocol field indicates a security problem (e.g. insecure implementation) + ["SECURITY"] = 167772160, + -- The protocol field indicates a packet comment + ["COMMENTS_GROUP"] = 184549376, + -- The protocol field indicates a decryption problem + ["DECRYPTION"] = 201326592, + -- The protocol field has incomplete data, decode based on assumed value + ["ASSUMPTION"] = 218103808, + -- The protocol field has been deprecated, usually PI_NOTE severity + ["DEPRECATED"] = 234881024, + }, + -- Expert severity levels + severity = { + -- Packet comment + ["COMMENT"] = 1048576, + -- Usual workflow, e.g. TCP connection establishing + ["CHAT"] = 2097152, + -- Notable messages, e.g. an application returned an "unusual" error code like HTTP 404 + ["NOTE"] = 4194304, + -- Warning, e.g. application returned an "unusual" error code + ["WARN"] = 6291456, + -- Serious problems, e.g. a malformed packet + ["ERROR"] = 8388608, + }, +} + + + +-- menu groups for register_menu +MENU_ANALYZE_UNSORTED = 0 +MENU_ANALYZE_CONVERSATION = 1 +MENU_STAT_UNSORTED = 2 +MENU_STAT_GENERIC = 3 +MENU_STAT_CONVERSATION = 4 +MENU_STAT_ENDPOINT = 5 +MENU_STAT_RESPONSE = 6 +MENU_STAT_TELEPHONY = 7 +MENU_STAT_TELEPHONY_ANSI = 8 +MENU_STAT_TELEPHONY_GSM = 9 +MENU_STAT_TELEPHONY_LTE = 10 +MENU_STAT_TELEPHONY_MTP = 11 +MENU_STAT_TELEPHONY_SCTP = 12 +MENU_TOOLS_UNSORTED = 13 + + +-- other useful constants +-- DATA_DIR and USER_DIR have a trailing directory separator. +GUI_ENABLED = gui_enabled() +DATA_DIR = Dir.global_config_path()..package.config:sub(1,1) +USER_DIR = Dir.personal_config_path()..package.config:sub(1,1) + +-- deprecated function names +datafile_path = Dir.global_config_path +persconffile_path = Dir.personal_config_path + + +if not running_superuser or run_user_scripts_when_superuser then + dofile(DATA_DIR.."console.lua") +end +--dofile(DATA_DIR.."dtd_gen.lua")