Wireshark · Ethereal-dev: [Ethereal-dev] Patch for SCAP in diameter.

[Goran Lazic <chupcko@xxxxxxxxxxxxxxxxxx>]

Use this patch for analyse SCAP attribute in diameter.

CHUPCKO

diff -urN ethereal-0.10.12-original/Makefile.am ethereal-0.10.12/Makefile.am
--- ethereal-0.10.12-original/Makefile.am	2005-07-26 21:26:51.000000000 +0200
+++ ethereal-0.10.12/Makefile.am	2005-10-07 15:31:56.000000000 +0200
@@ -84,7 +84,7 @@
 #
 diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
-	nasreq.xml sunping.xml
+	nasreq.xml scap.xml sunping.xml
 
 
 #
@@ -679,6 +679,7 @@
 	radius/dictionary.xedia \
 	randpkt.c		\
 	rdps.c			\
+	scap.xml		\
 	sunping.xml		\
 	text2pcap-scanner.l	\
 	text2pcap.c		\
diff -urN ethereal-0.10.12-original/Makefile.in ethereal-0.10.12/Makefile.in
--- ethereal-0.10.12-original/Makefile.in	2005-07-26 23:20:39.000000000 +0200
+++ ethereal-0.10.12/Makefile.in	2005-10-07 15:33:32.000000000 +0200
@@ -529,7 +529,7 @@
 #
 diameterdir = $(pkgdatadir)/diameter
 diameter_DATA = dictionary.dtd dictionary.xml imscxdx.xml mobileipv4.xml \
-	nasreq.xml sunping.xml
+	nasreq.xml scap.xml sunping.xml
 
 
 #
@@ -1280,6 +1280,7 @@
 	radius/dictionary.xedia \
 	randpkt.c		\
 	rdps.c			\
+	scap.xml		\
 	sunping.xml		\
 	text2pcap-scanner.l	\
 	text2pcap.c		\
diff -urN ethereal-0.10.12-original/dictionary.xml ethereal-0.10.12/dictionary.xml
--- ethereal-0.10.12-original/dictionary.xml	2005-07-26 21:26:51.000000000 +0200
+++ ethereal-0.10.12/dictionary.xml	2005-10-07 15:28:45.000000000 +0200
@@ -4,6 +4,7 @@
 	<!ENTITY mobileipv4 SYSTEM "mobileipv4.xml">
 	<!ENTITY sunping SYSTEM "sunping.xml">
 	<!ENTITY imscxdx SYSTEM "imscxdx.xml">
+	<!ENTITY scap SYSTEM "scap.xml">
 ]>
 <dictionary>
 	<base uri="http://www.ietf.org/rfc/rfc3588.txt";>
@@ -53,6 +54,7 @@
 		<vendor vendor-id="Sun" code="42" name="Sun Microsystems, Inc."/>
 		<vendor vendor-id="USR" code="429" name="US Robotics Corp."/>
 		<vendor vendor-id="TGPP"  code="10415" name="3GPP"/>
+		<vendor vendor-id="Ericsson" code="193" name="Ericsson"/>
 		<!-- *********************** End Vendors ************************** -->
 
 		<!-- ************************ typedefn's ************************** -->
@@ -703,5 +705,6 @@
 	&mobileipv4;
 	&sunping;
 	&imscxdx;
+	&scap;
 	
 </dictionary>
diff -urN ethereal-0.10.12-original/scap.xml ethereal-0.10.12/scap.xml
--- ethereal-0.10.12-original/scap.xml	1970-01-01 01:00:00.000000000 +0100
+++ ethereal-0.10.12/scap.xml	2005-10-07 15:28:48.000000000 +0200
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<application id="19302" name="SCAP" uri="http://www.ericsson.com/";>
+		<avp name="SCAP-Abnormal-Termination-Reason" code="600" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+			<enum name="SERVING_ELEMENT_TERMINATION" code="0"/>
+			<enum name="CONNECTION_TO_USER_BROKEN" code="1"/>
+		</avp>
+		<avp name="SCAP-Accounting-Correlation-Id" code="605" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="SCAP-Cost" code="603" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Float64"/>
+		</avp>
+		<avp name="SCAP-Cost-Information" code="604" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Cost"/>
+				<gavp name="Currency-Code"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Currency-Code" code="544" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="SCAP-Event-Timestamp" code="610" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Time"/>
+		</avp>
+		<avp name="SCAP-Exponent" code="616" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Integer32"/>
+		</avp>
+		<avp name="SCAP-Granted-Service-Unit" code="602" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Unit-Type"/>
+				<gavp name="Unit-Value"/>
+				<gavp name="Currency-Code"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Original-Subscription-Id" code="559" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Subscription-Id-Data"/>
+				<gavp name="Subscription-Id-Type"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Requested-Action" code="615" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+			<enum name="DIRECT_DEBITING" code="0"/>
+			<enum name="REFUND_ACCOUNT" code="1"/>
+		</avp>
+		<avp name="SCAP-Requested-Service-Unit" code="606" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Unit-Type"/>
+				<gavp name="Unit-Value"/>
+				<gavp name="Currency-Code"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Service-Parameter-Info" code="607" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Service-Parameter-Type"/>
+				<gavp name="Service-Parameter-Value"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Service-Parameter-Type" code="608" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+		</avp>
+		<avp name="SCAP-Service-Parameter-Value" code="609" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="UTF8String"/>
+		</avp>
+		<avp name="SCAP-Subscription-Id" code="553" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Subscription-Id-Data"/>
+				<gavp name="Subscription-Id-Type"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Subscription-Id-Data" code="554" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="UTF8String"/>
+		</avp>
+
+		<avp name="SCAP-Subscription-Id-Type" code="555" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+			<enum name="END_USER_MSISDN" code="0"/>
+			<enum name="END_USER_IMSI" code="1"/>
+			<enum name="END_USER_SIP_URL" code="2"/>
+			<enum name="END_USER_NAI" code="3"/>
+			<enum name="END_USER_PRIVATE" code="4"/>
+		</avp>
+		<avp name="SCAP-Unit-Type" code="611" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned32"/>
+			<enum name="SERVICE_CREDIT_TIME" code="0"/>
+			<enum name="SERVICE_CREDIT_VOLUME" code="1"/>
+			<enum name="SERVICE_CREDIT_EVENT" code="2"/>
+			<enum name="SERVICE_CREDIT_MONEY" code="3"/>
+		</avp>
+		<avp name="SCAP-Unit-Value" code="612" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Value-Digits"/>
+				<gavp name="Exponent"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Used-Service-Unit" code="613" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<grouped>
+				<gavp name="Unit-Type"/>
+				<gavp name="Unit-Value"/>
+				<gavp name="Currency-Code"/>
+			</grouped>
+		</avp>
+		<avp name="SCAP-Value-Digits" code="617" mandatory="must" vendor-bit="must" vendor-id="Ericsson" may-encrypt="no">
+			<type type-name="Unsigned64"/>
+		</avp>
+	</application>