From ea37c49f8286446350610d18f43a3e07a6e64538 Mon Sep 17 00:00:00 2001 From: erititan <elemer.lelik@ericsson.com> Date: Tue, 30 Aug 2016 12:48:33 +0200 Subject: [PATCH] Add new two AVPs and one CDR tag --- demo/RADIUS_Mapping_new.ttcn | 2 +- demo/RADIUS_Mapping_orig.ttcn | 2 +- demo/RADIUSandEAP_Mapping.ttcn | 2 +- demo/RadiusAndEAP_Demo.ttcn | 2 +- demo/Radius_Test_new.ttcn | 2 +- demo/Radius_Test_orig.ttcn | 2 +- ...ProtocolModule_Generator_CNL113600_PRI.doc | Bin 84480 -> 86528 bytes src/ATTR.awk | 2 +- src/RADIUS_EncDec.cc | 2 +- src/skt.rdf | 6 ++++-- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/demo/RADIUS_Mapping_new.ttcn b/demo/RADIUS_Mapping_new.ttcn index ba6f1e2..5592870 100644 --- a/demo/RADIUS_Mapping_new.ttcn +++ b/demo/RADIUS_Mapping_new.ttcn @@ -17,7 +17,7 @@ // // File: RADIUS_Mapping_new.ttcn // Description: Example module providing UDP Mapping for RPMG -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Remark: This file is not a part of the product. // diff --git a/demo/RADIUS_Mapping_orig.ttcn b/demo/RADIUS_Mapping_orig.ttcn index b1197c7..d4dd077 100644 --- a/demo/RADIUS_Mapping_orig.ttcn +++ b/demo/RADIUS_Mapping_orig.ttcn @@ -17,7 +17,7 @@ // // File: RADIUS_Mapping_orig.ttcn // Description: Example module providing UDP Mapping for RPMG -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Remark: This file is not a part of the product. // diff --git a/demo/RADIUSandEAP_Mapping.ttcn b/demo/RADIUSandEAP_Mapping.ttcn index 80a1174..7199ba8 100644 --- a/demo/RADIUSandEAP_Mapping.ttcn +++ b/demo/RADIUSandEAP_Mapping.ttcn @@ -17,7 +17,7 @@ // // File: RADIUSandEAP_Mapping.ttcn // Description: Example module providing UDP Mapping for RPMG -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Remark: This file is not a part of the product. // diff --git a/demo/RadiusAndEAP_Demo.ttcn b/demo/RadiusAndEAP_Demo.ttcn index f198de8..7720aff 100644 --- a/demo/RadiusAndEAP_Demo.ttcn +++ b/demo/RadiusAndEAP_Demo.ttcn @@ -16,7 +16,7 @@ ******************************************************************************/ // // File: RadiusAndEAP_Demo.ttcn -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Remark: This file is not a part of the product. // diff --git a/demo/Radius_Test_new.ttcn b/demo/Radius_Test_new.ttcn index 33c0cd8..1a23019 100644 --- a/demo/Radius_Test_new.ttcn +++ b/demo/Radius_Test_new.ttcn @@ -16,7 +16,7 @@ ******************************************************************************/ // // File: Radius_Test_new.ttcn -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Remark: This file is not a part of the product. // diff --git a/demo/Radius_Test_orig.ttcn b/demo/Radius_Test_orig.ttcn index 2eae197..f5303ce 100644 --- a/demo/Radius_Test_orig.ttcn +++ b/demo/Radius_Test_orig.ttcn @@ -16,7 +16,7 @@ ******************************************************************************/ // // File: Radius_Test_orig.ttcn -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Remark: This file is not a part of the product. // diff --git a/doc/RADIUS_ProtocolModule_Generator_CNL113600_PRI.doc b/doc/RADIUS_ProtocolModule_Generator_CNL113600_PRI.doc index a42e543928495b46652d2d21343c4860a539d652..d9d7fdfdfce82373095170f91347cceba2062e19 100644 GIT binary patch delta 20411 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 F{{iPm6a@eP delta 19610 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	AoaxZMxlQ=bZ)DJ~w^P_iKL8xbayB7I)ryZHJSo z`P&v2x}Dx;d#-=f_M7PT*9$$vGfjjh155{PANbTH$T?x>#5=ogU2kt5x^u&XHS4&A zZLLMmXJ>}~*f$`kDs77U;QjBe*}dP<)?q_w_Szv!dUvMRi;efk8;vd8H8d&nkJ(9s zMJDY96LW254kWpk2bP_^{I_41z&{2~^tiII<lOn#!0LNNCEn4#VQx2^oW5wk?dYC1 zws`s@gK4MVZT_YC`x%>;g;s_{4bNGjeYw$P!<E@7ISc)>eBCBq`+3^sf#(AL)PFuz z|FG+~yItC*7hfFzbW6~bt3d~6WRzU+d|G*JWouu*8D4KkFF#fm*zvU0sjQ2mtGouM zO*OJR)aZ7Tmc7EwdR2elW5lD)+AWP7KeX<aJN3R7$vIoj>B*-tdiz`ymqUF^gSp+g zNu`}RozA$ki&xMRX~FqcqLUi9eFDyabKpEE1MDB;*elb2f^6KCn~7KWM&l~AGu|(I z2);)NgYcTvCvX7oStaAWA7fMg@iTjB$evoUCm!q`H@h3l?uN2^MeLRVyW)ll`(Hci za?^z_zF;nDiS1Uv9e9G)z#9kwv!x8jVNd4Rqak+hpWS0-xAxf0EOys|UEZ?mR(4S; zyRw8j!A)Iu=YY5ZH-P^fBW-{eV5c%Zz!x_ii62({b6qd?)U*k~v1WtCzyi+|`hp># zvwd#S<*l5~x^K;*&A(cFOXvOGbz(mbH?zS^KtUmR2)=-?z!lE)0s=4)#DP)ZTd)$W z1_j^<V2(E%uujWtfce*Ti=;~@9BPr74VJWhxkGN>@=ly4JVVc2v8H>jG*P;Y!bv&_ zM2?G!G>CE)9mADR=Dguy12UXMkt8w-o{(QwvkNalJ$XWQbo-!sG<>K@r7gWyp==*3 z*O$Jl2vxF=N&T3<y-z(Q`qTN9t}6QlNcQuqXTL!DQq6urH14Xceck&BaFH5!)m5bI z6?Vg+E{_S&R_o5IyJiBkzdH95p<ULQN&M@{3#cbAu%0~Spo$dR1dCH$#;{Aly7TJx z3@*;<+0R#0PiEbo5!T}wTxHc$W^K<P{``$5A)>478b#0e)Z-a;$utV1CxiW`ETcq$ za;!&SG<_jO6Qd5po*|O1us2c}ze+ic^c66~(CZ9hq)b4{cmtkdNbZ9nxdp~r_A=mk zjEB(}KBF-#XMuB|H-^$Z;65<IbKn3l9HfJMpmzfcV~l-a_O$fIG0_wl%a|>NRpdAD zJGcX4Q3(y$#jum&iIkC}z$vUV3}7dtvy|~j8HpeXd;~91kN&7fD>KrWtUyIBqay50 zilL~$_n-_!q5`?#5io_#!C)j{54{V(9bhi0NA8GQ%{fsVjJ*pU19!}4KEM}r1R<b1 z2nPefAP@&eg1JBh7K0416>I~Cz+rF$+yq|%n`O;`E9eM9Kp(Ke2)C{?Q2Pzw2k<j$ zc?f(3>~-f}AO<9Y*?@v=AP1ZUZQu=mFcu^M_Fk_T>;Z+~H*gm`2aVw{HxLA3!9?&M z_WI2MtlR<j!9aL)9AK}uQji7M`!9cj*I*dDodDK>&0sqy29Ll;P=pAa0jco*w;&tr z1~1|D4?qK+Hv()njRjLgSg`-2pAJ&NOfU<ifjNNX&jSm=K9C3Af_FfOQwm?u350=2 zz#f~I0QR_C2amnIz+^B5Yz5oE6;J^*asFe$o{Rf|P!I;Ri5AhOf`{p}!@aIF`(7;V zd(Vn~zBf>`7=c^`Sc@46QW3%9ESd-$>ypU`8tZPK0PAwEKp!|h3b3xnoX@)7O2E3{ zZ$Jp2F`u%oI1I4vxCyW>c?p=qcl`mnridKC3hSR{a3t%WZ2{|}qX6rt?41tQSMLJW zRcoA#_5ZDp7uceu)OM~OoahMt$;mPw2h{d6X~evZWdrbTh*FJ?7HO1g^k6*Szn>vW z&!v%Cf=Dd`th?2AkfM|7Ym5uvP{jtx8e(nVNPQx#v*pR05~Sc1O}Il7jc)~hphB`v zv~r6d2DWb58YhriXnQyTCRKoaJRuv~R)biN)FSLPnG2d?Cv$GQ_?$WSt$4Tv7bf0e z!TE}BTW~YPLoB%??pj6}L>!Poc6QDn|LIFfhF~4>ZJbF``ec%lxtXMDteA8USx?Rk z6!&Y&1&dcT<@y?#2meamru~W^csNKRV-AYnHs#{PL##Mw{o7G@$)<kyi0;&T;x$&> z7|WJJKanvVJ`;C`FA@WJcZyA{xu8buS|d3>!kWv~2&h=@x@23r>k^j}8auRc#*I;5 z6X(Tf?v2S~Y@zOW>8-X@BR|NF8_qRmEj`^jf0I3@!R2pl#=Ym<%t;rVyLQL9d^Cw6 zj-(g4OQw)n_?3*;*y>8+$Ye4R%PINC9XSgwvpMI@Ws3#PIS<il9EVx(J5u~(9r=uu zIoTLz;JD%;&PdUJi8oSQ{gA#$(f3I#Qd|X*c%*EEpNbSMjLbudmPM8##W)~2t4Dt) zS=h!Od4MS5iiL~-k)dJY>&>|{w&>GD`Y*mp|KSU<xUdBm#|gyt&RknAKs?x)YZbPY zUO^5CVT%hPC%D(8oMe4+Np3cNRzk8q_vm@{6BF>Oq<So6PG%`{v}XP#XU@xjW^3tW z3c2#;Jvd1g^Ey*uQD7<aHA_)9@mC>dEjISyR&(>jn|-(zq5#yFwaNZS8zD_X%3Qe$ zDRX5mQs&BHq|B8Ukunzsz(34|-H<XD4nfLX$a*AHNHJ3UkqRuB3-2SvP)fccWuY*G z5H58mEwF+ylmsBfC8Xrs0b?nNz&7egMj>UcP0F9-%kAPUig46QY_l4Tz{Ma-%f+7l z+(KR1=4F1<50{H9_ni1wf6mKE`P`qs_06(nYA4mJc|(O)YbHsH)v2+wNoBQz>eT{k zspYCy3#g^GTfLfpEwvr$)!4<bVih*4SM#l<wn4p`Pc5}|>eYm`)K;li6Vy^$rd~}R z1$#+V7OGQY*UPe+@@jL`tI4CltEH+}lShG9OHr>Tj{>hYQN5Zx3cT7F^=k4c@M^== ztI4Cls|{AKCXWKI)?dAvJPN#8Z}n>ODA-A&&`q5h9`e>ifmaJvuO^QIuhv$*nmh`; znxA?#c@%gxFZF8jDDY}->eb{?;MH2FSCdD9SF=~ICXWKI)>OTkJPN#;iF!3z6#Ow> zvTm)fs>XVPEDAEUMiMopTP~6tOyWnOT*rE6uMV9!d(2+3ow)5f(x0l3OljdZRye%c zpS2j8Kdm#Du7Rn^DzhthqY3-{E@n_L5I^e5MHw?mKWs&U{!H4d8+XT-NmpQNC0GSk zgAA|+P{8unA<YD0kj2sw-8pjumh(l*=KPHAToRX&Y@FGHOVD-v+eGqHO+SjK_25K} xS-TtLCH~lho7K24)+eNjXZ7SnT%!16Pi_`YyQcNxM2*%W$1(pyFHXDB{{Wt*-f;i` diff --git a/src/ATTR.awk b/src/ATTR.awk index 97756c7..70887a7 100644 --- a/src/ATTR.awk +++ b/src/ATTR.awk @@ -18,7 +18,7 @@ # # # File: ATTR.awk # # Description: RPMG AWK script for weaving RDF files # -# Rev: R12A +# Rev: R13A # Prodnr: CNL 113 600 # ############################################################################# diff --git a/src/RADIUS_EncDec.cc b/src/RADIUS_EncDec.cc index 009202e..9d733a3 100644 --- a/src/RADIUS_EncDec.cc +++ b/src/RADIUS_EncDec.cc @@ -18,7 +18,7 @@ // // File: RADIUS_EncDec.cc // Description: Encoder/Decoder and external functions for RPMG -// Rev: R12A +// Rev: R13A // Prodnr: CNL 113 600 // Reference: RFC 2865(RADIUS), 2866(RADIUS Accounting), // diff --git a/src/skt.rdf b/src/skt.rdf index 0197074..b5e0a2a 100644 --- a/src/skt.rdf +++ b/src/skt.rdf @@ -1,5 +1,5 @@ /****************************************************************************** -* Copyright (c) 2008, 2015 Ericsson AB +* Copyright (c) 2008, 2016 Ericsson AB * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -30,6 +30,7 @@ type enum_8 skt_type_enum { service_key (1), prepaid_expired (2), + data_zone_service (3), preservation_indicator (17) } @@ -53,7 +54,8 @@ type record skt_subattr_t { variant (skt_val) "CROSSTAG( string_val, skt_type=preservation_indicator; byte_val, skt_type=prepaid_expired; - integer_val, skt_type=service_key)" + integer_val, skt_type=service_key; + string_val, skt_type=data_zone_service)" } type set of skt_subattr_t skt_subattr_list; -- GitLab