From afcbef874a7550ab7b4311fdafdf272c6b4f68ca Mon Sep 17 00:00:00 2001 From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com> Date: Fri, 24 Jul 2020 00:00:17 +0300 Subject: [PATCH] Discarding the master and slave terminology --- layers/iana_ports.go | 42 +++++++++++++++++++------------------- macs/valid_mac_prefixes.go | 24 +++++++++++----------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/layers/iana_ports.go b/layers/iana_ports.go index fbf281e..0c21b56 100644 --- a/layers/iana_ports.go +++ b/layers/iana_ports.go @@ -1391,7 +1391,7 @@ var tcpPortNames = map[TCPPort]string{ 1721: "caicci", 1722: "hks-lm", 1723: "pptp", - 1724: "csbphonemaster", + 1724: "csbphonemain", 1725: "iden-ralp", 1726: "iberiagames", 1727: "winddx", @@ -1922,7 +1922,7 @@ var tcpPortNames = map[TCPPort]string{ 2257: "simple-tx-rx", 2258: "rcts", 2260: "apc-2260", - 2261: "comotionmaster", + 2261: "comotionmain", 2262: "comotionback", 2263: "ecwcfg", 2264: "apx500api-1", @@ -2060,8 +2060,8 @@ var tcpPortNames = map[TCPPort]string{ 2399: "fmpro-fdal", 2400: "opequus-server", 2401: "cvspserver", - 2402: "taskmaster2000", - 2403: "taskmaster2000", + 2402: "taskmain2000", + 2403: "taskmain2000", 2404: "iec-104", 2405: "trc-netpoll", 2406: "jediserver", @@ -2751,7 +2751,7 @@ var tcpPortNames = map[TCPPort]string{ 3099: "chmd", 3100: "opcon-xps", 3101: "hp-pxpib", - 3102: "slslavemon", + 3102: "slsubordinatemon", 3103: "autocuesmi", 3104: "autocuelog", 3105: "cardbox", @@ -2764,7 +2764,7 @@ var tcpPortNames = map[TCPPort]string{ 3112: "ksysguard", 3113: "cs-auth-svr", 3114: "ccmad", - 3115: "mctet-master", + 3115: "mctet-main", 3116: "mctet-gateway", 3117: "mctet-jserv", 3118: "pkagent", @@ -2824,7 +2824,7 @@ var tcpPortNames = map[TCPPort]string{ 3173: "serverview-icc", 3174: "armi-server", 3175: "t1-e1-over-ip", - 3176: "ars-master", + 3176: "ars-main", 3177: "phonex-port", 3178: "radclientport", 3179: "h2gf-w-2m", @@ -4564,7 +4564,7 @@ var tcpPortNames = map[TCPPort]string{ 6432: "pgbouncer", 6442: "tarp", 6443: "sun-sr-https", - 6444: "sge-qmaster", + 6444: "sge-qmain", 6445: "sge-execd", 6446: "mysql-proxy", 6455: "skip-cert-recv", @@ -4604,7 +4604,7 @@ var tcpPortNames = map[TCPPort]string{ 6566: "sane-port", 6568: "canit-store", 6579: "affiliate", - 6580: "parsec-master", + 6580: "parsec-main", 6581: "parsec-peer", 6582: "parsec-game", 6583: "joaJewelSuite", @@ -5597,7 +5597,7 @@ var tcpPortNames = map[TCPPort]string{ 33333: "dgi-serv", 33334: "speedtrace", 33434: "traceroute", - 33656: "snip-slave", + 33656: "snip-subordinate", 34249: "turbonote-2", 34378: "p-net-local", 34379: "p-net-remote", @@ -7070,7 +7070,7 @@ var udpPortNames = map[UDPPort]string{ 1721: "caicci", 1722: "hks-lm", 1723: "pptp", - 1724: "csbphonemaster", + 1724: "csbphonemain", 1725: "iden-ralp", 1726: "iberiagames", 1727: "winddx", @@ -7596,7 +7596,7 @@ var udpPortNames = map[UDPPort]string{ 2257: "simple-tx-rx", 2258: "rcts", 2260: "apc-2260", - 2261: "comotionmaster", + 2261: "comotionmain", 2262: "comotionback", 2263: "ecwcfg", 2264: "apx500api-1", @@ -7727,8 +7727,8 @@ var udpPortNames = map[UDPPort]string{ 2399: "fmpro-fdal", 2400: "opequus-server", 2401: "cvspserver", - 2402: "taskmaster2000", - 2403: "taskmaster2000", + 2402: "taskmain2000", + 2403: "taskmain2000", 2404: "iec-104", 2405: "trc-netpoll", 2406: "jediserver", @@ -8414,7 +8414,7 @@ var udpPortNames = map[UDPPort]string{ 3099: "chmd", 3100: "opcon-xps", 3101: "hp-pxpib", - 3102: "slslavemon", + 3102: "slsubordinatemon", 3103: "autocuesmi", 3104: "autocuetime", 3105: "cardbox", @@ -8427,7 +8427,7 @@ var udpPortNames = map[UDPPort]string{ 3112: "ksysguard", 3113: "cs-auth-svr", 3114: "ccmad", - 3115: "mctet-master", + 3115: "mctet-main", 3116: "mctet-gateway", 3117: "mctet-jserv", 3118: "pkagent", @@ -8486,7 +8486,7 @@ var udpPortNames = map[UDPPort]string{ 3173: "serverview-icc", 3174: "armi-server", 3175: "t1-e1-over-ip", - 3176: "ars-master", + 3176: "ars-main", 3177: "phonex-port", 3178: "radclientport", 3179: "h2gf-w-2m", @@ -10120,7 +10120,7 @@ var udpPortNames = map[UDPPort]string{ 6420: "nim-vdrshell", 6421: "nim-wan", 6443: "sun-sr-https", - 6444: "sge-qmaster", + 6444: "sge-qmain", 6445: "sge-execd", 6446: "mysql-proxy", 6455: "skip-cert-recv", @@ -10160,7 +10160,7 @@ var udpPortNames = map[UDPPort]string{ 6566: "sane-port", 6568: "rp-reputation", 6579: "affiliate", - 6580: "parsec-master", + 6580: "parsec-main", 6581: "parsec-peer", 6582: "parsec-game", 6583: "joaJewelSuite", @@ -10971,7 +10971,7 @@ var udpPortNames = map[UDPPort]string{ 25902: "nilinkanalyst", 25903: "niprobe", 25954: "bf-game", - 25955: "bf-master", + 25955: "bf-main", 26000: "quake", 26133: "scscp", 26208: "wnn6-ds", @@ -11028,7 +11028,7 @@ var udpPortNames = map[UDPPort]string{ 33331: "diamondport", 33334: "speedtrace-disc", 33434: "traceroute", - 33656: "snip-slave", + 33656: "snip-subordinate", 34249: "turbonote-2", 34378: "p-net-local", 34379: "p-net-remote", diff --git a/macs/valid_mac_prefixes.go b/macs/valid_mac_prefixes.go index 4afee40..aab4529 100644 --- a/macs/valid_mac_prefixes.go +++ b/macs/valid_mac_prefixes.go @@ -444,7 +444,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 1, 170}: "Airspan Communications, Ltd.", [3]byte{0, 1, 171}: "Main Street Networks", [3]byte{0, 1, 172}: "Sitara Networks, Inc.", - [3]byte{0, 1, 173}: "Coach Master International d.b.a. CMI Worldwide, Inc.", + [3]byte{0, 1, 173}: "Coach Main International d.b.a. CMI Worldwide, Inc.", [3]byte{0, 1, 174}: "Trex Enterprises", [3]byte{0, 1, 175}: "Artesyn Embedded Technologies", [3]byte{0, 1, 176}: "Fulltek Technology Co., Ltd.", @@ -2269,7 +2269,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 8, 229}: "IDK Corporation", [3]byte{0, 8, 230}: "Littlefeet", [3]byte{0, 8, 231}: "SHI ControlSystems,Ltd.", - [3]byte{0, 8, 232}: "Excel Master Ltd.", + [3]byte{0, 8, 232}: "Excel Main Ltd.", [3]byte{0, 8, 233}: "NextGig", [3]byte{0, 8, 234}: "Motion Control Engineering, Inc", [3]byte{0, 8, 235}: "ROMWin Co.,Ltd.", @@ -3249,7 +3249,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 12, 186}: "Jamex, Inc.", [3]byte{0, 12, 187}: "ISKRAEMECO", [3]byte{0, 12, 188}: "Iscutum", - [3]byte{0, 12, 189}: "Interface Masters, Inc", + [3]byte{0, 12, 189}: "Interface Mains, Inc", [3]byte{0, 12, 190}: "Innominate Security Technologies AG", [3]byte{0, 12, 191}: "Holy Stone Ent. Co., Ltd.", [3]byte{0, 12, 192}: "Genera Oy", @@ -5087,7 +5087,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 19, 232}: "Intel Corporate", [3]byte{0, 19, 233}: "VeriWave, Inc.", [3]byte{0, 19, 234}: "Kamstrup A/S", - [3]byte{0, 19, 235}: "Sysmaster Corporation", + [3]byte{0, 19, 235}: "Sysmain Corporation", [3]byte{0, 19, 236}: "Sunbay Software AG", [3]byte{0, 19, 237}: "PSIA", [3]byte{0, 19, 238}: "JBX Designs Inc.", @@ -6220,7 +6220,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 24, 85}: "Aeromaritime Systembau GmbH", [3]byte{0, 24, 86}: "EyeFi, Inc", [3]byte{0, 24, 87}: "Unilever R&D", - [3]byte{0, 24, 88}: "TagMaster AB", + [3]byte{0, 24, 88}: "TagMain AB", [3]byte{0, 24, 89}: "Strawberry Linux Co.,Ltd.", [3]byte{0, 24, 90}: "uControl, Inc.", [3]byte{0, 24, 91}: "Network Chemistry, Inc", @@ -7891,7 +7891,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 30, 220}: "Sony Ericsson Mobile Communications AB", [3]byte{0, 30, 221}: "WASKO S.A.", [3]byte{0, 30, 222}: "BYD COMPANY LIMITED", - [3]byte{0, 30, 223}: "Master Industrialization Center Kista", + [3]byte{0, 30, 223}: "Main Industrialization Center Kista", [3]byte{0, 30, 224}: "Urmet Domus SpA", [3]byte{0, 30, 225}: "Samsung Electronics Co.,Ltd", [3]byte{0, 30, 226}: "Samsung Electronics Co.,Ltd", @@ -8486,7 +8486,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 33, 47}: "Phoebe Micro Inc.", [3]byte{0, 33, 48}: "Keico Hightech Inc.", [3]byte{0, 33, 49}: "Blynke Inc.", - [3]byte{0, 33, 50}: "Masterclock, Inc.", + [3]byte{0, 33, 50}: "Mainclock, Inc.", [3]byte{0, 33, 51}: "Building B, Inc", [3]byte{0, 33, 52}: "Brandywine Communications", [3]byte{0, 33, 53}: "ALCATEL-LUCENT", @@ -9192,7 +9192,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{0, 35, 241}: "Sony Ericsson Mobile Communications", [3]byte{0, 35, 242}: "TVLogic", [3]byte{0, 35, 243}: "Glocom, Inc.", - [3]byte{0, 35, 244}: "Masternaut", + [3]byte{0, 35, 244}: "Mainnaut", [3]byte{0, 35, 245}: "WILO SE", [3]byte{0, 35, 246}: "Softwell Technology Co., Ltd.", [3]byte{0, 35, 247}: "PRIVATE", @@ -15977,7 +15977,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{116, 136, 139}: "ADB Broadband Italia", [3]byte{116, 142, 8}: "Bestek Corp.", [3]byte{116, 142, 248}: "Brocade Communications Systems, Inc.", - [3]byte{116, 143, 27}: "MasterImage 3D", + [3]byte{116, 143, 27}: "MainImage 3D", [3]byte{116, 143, 77}: "MEN Mikro Elektronik GmbH", [3]byte{116, 144, 80}: "Renesas Electronics Corporation", [3]byte{116, 145, 26}: "Ruckus Wireless", @@ -17197,7 +17197,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{160, 109, 9}: "Intelcan Technosystems Inc.", [3]byte{160, 110, 80}: "Nanotek Elektronik Sistemler Ltd. Sti.", [3]byte{160, 113, 169}: "Nokia Corporation", - [3]byte{160, 115, 50}: "Cashmaster International Limited", + [3]byte{160, 115, 50}: "Cashmain International Limited", [3]byte{160, 115, 252}: "Rancore Technologies Private Limited", [3]byte{160, 117, 145}: "Samsung Electronics Co.,Ltd", [3]byte{160, 119, 113}: "Vialis BV", @@ -17282,7 +17282,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{164, 37, 27}: "Avaya, Inc", [3]byte{164, 41, 64}: "Shenzhen YOUHUA Technology Co., Ltd", [3]byte{164, 41, 183}: "bluesky", - [3]byte{164, 44, 8}: "Masterwork Automodules", + [3]byte{164, 44, 8}: "Mainwork Automodules", [3]byte{164, 51, 209}: "Fibrlink Communications Co.,Ltd.", [3]byte{164, 56, 252}: "Plastic Logic", [3]byte{164, 58, 105}: "Vers Inc", @@ -19515,7 +19515,7 @@ var validMACPrefixMap = map[[3]byte]string{ [3]byte{244, 165, 42}: "Hawa Technologies Inc", [3]byte{244, 172, 193}: "CISCO SYSTEMS, INC.", [3]byte{244, 177, 100}: "Lightning Telecommunications Technology Co. Ltd", - [3]byte{244, 179, 129}: "WindowMaster A/S", + [3]byte{244, 179, 129}: "WindowMain A/S", [3]byte{244, 181, 47}: "Juniper networks", [3]byte{244, 181, 73}: "Yeastar Technology Co., Ltd.", [3]byte{244, 182, 229}: "TerraSem Co.,Ltd",