osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks. 

Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a
Reviewed-on: https://code.wireshark.org/review/6647
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Josip Medved 2015-01-19 00:33:22 -08:00 committed by Anders Broman
parent 1b5a965bab
commit c8bca4fa9a
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -89,7 +89,7 @@ dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
diameter/Vodafone.xml \
diameter/AlcatelLucent.xml \
diameter/Nokia.xml \
diameter/NokiaSiemensNetworks.xml \
diameter/NokiaSolutionsAndNetworks.xml \
diameter/SKT.xml \
diameter/HP.xml \
diameter/VerizonWireless.xml

13
diameter/NokiaSiemensNetworks.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Nokia Siemens Networks verndor-specific AVPs. -->
<application id="16777317" name="Nokia Siemens Networks (NSN) Hd Application" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
<avp name="User-Agent-Type" code="2016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSiemensNetworks">
<type type-name="Enumerated"/>
<enum name="NON_MOBILE_BROWSER" code="0"/>
<enum name="MOBILE_BROWSER" code="1"/>
</avp>
</application>

13
diameter/NokiaSolutionsAndNetworks.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Nokia Solutions and Networks vendor-specific AVPs. -->
<application id="16777317" name="Nokia Solutions and Networks (NSN) Hd Application" uri="http://www.3gpp.org/ftp/Specs/html-info/29212.htm">
<avp name="User-Agent-Type" code="2016" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="NokiaSolutionsAndNetworks">
<type type-name="Enumerated"/>
<enum name="NON_MOBILE_BROWSER" code="0"/>
<enum name="MOBILE_BROWSER" code="1"/>
</avp>
</application>

10
diameter/dictionary.xml
View File

@ -23,7 +23,7 @@
<!ENTITY Vodafone SYSTEM "Vodafone.xml">
<!ENTITY AlcatelLucent SYSTEM "AlcatelLucent.xml">
<!ENTITY Nokia SYSTEM "Nokia.xml">
<!ENTITY NokiaSiemensNetworks SYSTEM "NokiaSiemensNetworks.xml">
<!ENTITY NokiaSolutionsAndNetworks SYSTEM "NokiaSolutionsAndNetworks.xml">
<!ENTITY SKT SYSTEM "SKT.xml">
<!ENTITY ChinaTelecom SYSTEM "ChinaTelecom.xml">
<!ENTITY VerizonWireless SYSTEM "VerizonWireless.xml">
@ -175,7 +175,7 @@
<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
<vendor vendor-id="Merit" code="61" name="Merit Networks"/>
<vendor vendor-id="Nokia" code="94" name="Nokia"/>
<vendor vendor-id="NokiaSiemensNetworks" code="28458" name="Nokia Siemens Networks"/>
<vendor vendor-id="NokiaSolutionsAndNetworks" code="28458" name="Nokia Solutions and Networks"/>
<vendor vendor-id="Ericsson" code="193" name="Ericsson"/>
<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
<vendor vendor-id="ALU" code="637" name="ALU Network"/>
@ -1730,7 +1730,7 @@
<enum name="Ericsson Diameter Signalling Controller Application (DSC)" code="16777315"/>
<!--
16777316 Verizon-Femto-Loc [Niranjan_Avula]
16777317 Nokia Siemens Networks (NSN) Hd Application [Hannes_Tschofenig]
16777317 Nokia Solutions and Networks (NSN) Hd Application [Hannes_Tschofenig]
16777318 3GPP S15 [3GPP TS 29.212][Kimmo_Kymalainen]
16777319 3GPP S9a [3GPP TS 29.215][Kimmo_Kymalainen]
16777320 3GPP S9a* [3GPP TS 29.215][Kimmo_Kymalainen]
@ -6617,7 +6617,7 @@
16777267 is defined in TGPP.xml
16777292 is defined in TGPP.xml
16777304 is defined in SKT.xml
16777317 is defined in NokiaSiemensNetworks.xml
16777317 is defined in NokiaSolutionsAndNetworks.xml
-->
<application id="0" name="Diameter Common Messages" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
<application id="3" name="Diameter Base Accounting" uri="http://www.ietf.org/rfc/rfc3588.txt?number=3588"></application>
@ -6655,7 +6655,7 @@
&Vodafone;
&AlcatelLucent;
&Nokia;
&NokiaSiemensNetworks;
&NokiaSolutionsAndNetworks;
&SKT;
&ChinaTelecom;
&VerizonWireless;

2
epan/dissectors/packet-flip.c
View File

@ -24,7 +24,7 @@
/*
* FLIP (Flow Layer Internal Protocol) is a proprietary protocol
* developed by Nokia Siemens Networks.
* developed by Nokia Solutions and Networks (previous was 'Nokia Siemens Networks').
*/
/*

2
epan/etypes.h
View File

@ -483,7 +483,7 @@ extern "C" {
#endif
#ifndef ETHERTYPE_FLIP
#define ETHERTYPE_FLIP 0x8901 /* Nokia Siemens Networks Flow Layer Internal Protocol */
#define ETHERTYPE_FLIP 0x8901 /* Nokia Solutions and Networks Flow Layer Internal Protocol */
#endif
#ifndef ETHERTYPE_CFM

2
packaging/nsis/wireshark.nsi
View File

@ -473,7 +473,7 @@ File "..\..\diameter\mobileipv4.xml"
File "..\..\diameter\mobileipv6.xml"
File "..\..\diameter\nasreq.xml"
File "..\..\diameter\Nokia.xml"
File "..\..\diameter\NokiaSiemensNetworks.xml"
File "..\..\diameter\NokiaSolutionsAndNetworks.xml"
File "..\..\diameter\sip.xml"
File "..\..\diameter\Starent.xml"
File "..\..\diameter\sunping.xml"