Commit f27389b1 authored by garciay's avatar garciay
Browse files

Build with XSD 

Test in IPv4 with STF370 Lanion logs and EyePMedia
Test in IPv4 with EyePMedia logs sent by Julien
Minimal tests in IPv6
parent 3a352af4

adapter/Adapter.prj

+61 −49
Original line number Diff line number Diff line
@@ -13,59 +13,71 @@ Include Sub Directories=1 
0=

[Open Files]

Open File0=C:\cygwin\home\yann\dev\g++\STF407\adapter\yann.txt

Open File Pos0=0

Open File Line0=0

Active File Index=3

Open File Pos0=13607

Open File Line0=5949

Active File Index=1

Open File Window Pos0=0,1,-1,-1,-4,-23,176,176,952,682

Open File1=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Capture\log.txt

Open File Pos1=1024

Open File1=C:\temp\LibSip.log

Open File Pos1=347

Open File Line1=0

Open File Window Pos1=0,1,-1,-1,-4,-23,66,66,846,576

Open File2=C:\cygwin\home\yann\dev\g++\STF407\adapter\MMagic\STF407_ATS\mmagic_adapter_log.txt

Open File Window Pos1=2,3,-1,-1,-4,-23,242,242,1071,752

Open File2=C:\cygwin\home\yann\dev\g++\STF407\adapter\tmp\gen\gen_classes.h

Active File Display Mode=3

Open File Pos2=15644

Open File Line2=6827

Open File Window Pos2=0,1,-1,-1,-4,-23,198,198,978,708

Open File3=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\LowerTestAdapter\LowerTestAdapter.cpp

Open File Pos3=4786

Open File Line3=3941

Open File Window Pos3=2,3,-1,-1,-4,-23,110,110,890,620

Open File4=

Open File Pos4=565

Open File Line4=0

Open File Window Pos4=0,1,-1,-1,-4,-23,44,44,824,554

Open File5=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\LowerTestAdapter\LowerTestAdapter.cpp

Open File Pos5=5119

Open File Line5=3978

Open File Window Pos5=0,1,-1,-1,-4,-23,110,110,890,620

Open File6=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Capture\PCAPCapture.cpp

Open File Pos6=3949

Open File Line6=3519

Open File Window Pos6=0,1,-1,-1,-4,-23,220,220,1000,730

Open File7=C:\cygwin\home\yann\tmp\wireshark\capture-wpcap.c

Open File Pos7=2153

Open File Line7=1707

Open File Window Pos7=2,3,-1,-1,-4,-23,242,242,1022,752

Open File8=

Open File Pos8=0

Open File Line8=1562

Open File Window Pos8=0,1,-1,-1,-4,-23,22,22,784,532

Open File9=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Ipv6Dissector.cpp

Open File Pos9=1760

Open File Line9=1051

Open File Window Pos9=0,1,-1,-1,-4,-23,44,44,806,554

Open File10=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\IpDissector.cpp

Open File Pos10=0

Open File Line10=3760

Open File Window Pos10=0,1,-1,-1,-4,-23,66,66,828,576

Open File11=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Ipv6Dissector.h

Open File Pos11=1620

Open File Line11=0

Open File Window Pos11=0,1,-1,-1,-4,-23,110,110,872,620

Open File12=

Open File Pos2=149088

Open File Line2=147939

Open File Window Pos2=0,1,-1,-1,-4,-23,22,22,851,532

Open File3=C:\cygwin\home\yann\dev\g++\STF407\codec\c++\sip_codets.cpp

Open File Pos3=7624

Open File Line3=6663

Open File Window Pos3=0,1,-1,-1,-4,-23,198,198,1027,708

Open File4=C:\cygwin\home\yann\dev\g++\STF407\codec\c++\Regex.h

Open File Pos4=5131

Open File Line4=4137

Open File Window Pos4=0,1,-1,-1,-4,-23,44,44,873,554

Open File5=

Open File Pos5=332

Open File Line5=0

Open File Window Pos5=0,1,-1,-1,-4,-23,242,242,1022,752

Open File6=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Ipv6Filter.h

Open File Pos6=672

Open File Line6=0

Open File Window Pos6=0,1,-1,-1,-4,-23,44,44,873,554

Open File7=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Ipv6Filter.cpp

Open File Pos7=2451

Open File Line7=2611

Open File Window Pos7=0,1,-1,-1,-4,-23,176,176,956,686

Open File8=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\ProtocolInfo.h

Open File Pos8=390

Open File Line8=0

Open File Window Pos8=0,1,-1,-1,-4,-23,22,22,851,532

Open File9=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\ProtocolInfo.cpp

Open File Pos9=1965

Open File Line9=1497

Open File Window Pos9=0,1,-1,-1,-4,-23,110,110,939,620

Open File10=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Ipv6Dissector.h

Open File Pos10=383

Open File Line10=0

Open File Window Pos10=0,1,-1,-1,-4,-23,88,88,917,598

Open File11=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Ipv6Dissector.cpp

Open File Pos11=2260

Open File Line11=745

Open File Window Pos11=0,1,-1,-1,-4,-23,0,0,829,510

Open File12=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Dispatcher.cpp

Open File Pos12=319

Open File Line12=2709

Open File Window Pos12=0,1,-1,-1,-4,-23,22,22,851,532

Open File13=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Dispatcher\Filter.cpp

Open File Pos13=3206

Open File Line13=2058

Open File Window Pos13=0,1,-1,-1,-4,-23,66,66,895,576

Open File14=C:\cygwin\home\yann\dev\g++\STF407\codec\c++\sip_codets.cpp

Open File Pos14=24002

Open File Line14=24398

Open File Window Pos14=2,3,-1,-1,-4,-23,242,242,1071,752

Open File15=

[File View]

Current Select=C:\cygwin\home\yann\dev\g++\STF407\adapter\src\Capture\TrafficCapture.cpp

Scroll Position=128

Current Select=C:\cygwin\home\yann\dev\g++\STF407\codec\c++\Regex.h

Scroll Position=126

[Files]

0=C:\cygwin\home\yann\dev\g++\STF407\trunk\ttcn\AtsImsIot\

1=C:\cygwin\home\yann\dev\g++\STF407\trunk\ttcn\LibCommon\ttcn\

adapter/MMagic/STF407_ATS/STF407_ATS.mmsln

+224 −50
Original line number Diff line number Diff line
@@ -128,74 +128,248 @@ 
    <type>ttcn3</type>

   </script>

   <script>

    <name>LibIms_Interface</name>

    <file>..\..\..\ttcn\LibImsWithoutXSD\ttcn\LibIms_Interface.ttcn</file>

    <name>AtsImsIot_TestCases_RCS</name>

    <file>..\..\..\ttcn\AtsImsIot\AtsImsIot_TestCases_RCS.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibIms_PIXITS</name>

    <file>..\..\..\ttcn\LibImsWithoutXSD\ttcn\LibIms_PIXITS.ttcn</file>

    <name>LibSip_Interface</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_Interface.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibIms_SIPTypesAndValues</name>

    <file>..\..\..\ttcn\LibImsWithoutXSD\ttcn\LibIms_SIPTypesAndValues.ttcn</file>

    <name>LibSip_PIXITS</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_PIXITS.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibIms_Steps</name>

    <file>..\..\..\ttcn\LibImsWithoutXSD\ttcn\LibIms_Steps.ttcn</file>

    <name>LibSip_SDPTypes1</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_SDPTypes.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibIms_Templates</name>

    <file>..\..\..\ttcn\LibImsWithoutXSD\ttcn\LibIms_Templates.ttcn</file>

    <name>LibSip_SIPTypesAndValues1</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_SIPTypesAndValues.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_Interface</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_Interface.ttcn</file>

    <name>LibSip_Steps</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_Steps.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_PIXITS</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_PIXITS.ttcn</file>

    <name>LibSip_Templates</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_Templates.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_SDPTypes</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_SDPTypes.ttcn</file>

    <name>LibSip_XMLTypes1</name>

    <file>..\..\..\ttcn\LibSip\ttcn\LibSip_XMLTypes.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_SIPTypesAndValues</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_SIPTypesAndValues.ttcn</file>

    <name>XSDAUX</name>

    <file>..\..\..\ttcn\LibSip\ttcn\XSDAUX.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_Steps</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_Steps.ttcn</file>

    <name>ACR_CB</name>

    <file>..\..\..\ttcn\LibSip\xsd\ACR_CB.xsd</file>

    <type>xsd</type>

    <sh>67B59DC565C45E48964A1415E36C58ED</sh>

   </script>

   <script>

    <name>CDIV</name>

    <file>..\..\..\ttcn\LibSip\xsd\CDIV.xsd</file>

    <type>xsd</type>

    <sh>A36AB28C19D57A00529BBA7695E9AFE2</sh>

   </script>

   <script>

    <name>CDIVN</name>

    <file>..\..\..\ttcn\LibSip\xsd\CDIVN.xsd</file>

    <type>xsd</type>

    <sh>14A408EEA346EEFA9EE7B4593C6BE43A</sh>

   </script>

   <script>

    <name>common_policy</name>

    <file>..\..\..\ttcn\LibSip\xsd\common-policy.xsd</file>

    <type>xsd</type>

    <sh>10D49366B9543CA47BBD7034F62A145B</sh>

   </script>

   <script>

    <name>CONF</name>

    <file>..\..\..\ttcn\LibSip\xsd\CONF.xsd</file>

    <type>xsd</type>

    <sh>A552FE5A470A006CCD39564607993A4F</sh>

   </script>

   <script>

    <name>cug</name>

    <file>..\..\..\ttcn\LibSip\xsd\cug.xsd</file>

    <type>xsd</type>

    <sh>B832D001B8438FED8DCEB371726869CB</sh>

   </script>

   <script>

    <name>cw</name>

    <file>..\..\..\ttcn\LibSip\xsd\cw.xsd</file>

    <type>xsd</type>

    <sh>6DBA0D6B62AE19DD332B622713EF91C7</sh>

   </script>

   <script>

    <name>Ims3gpp</name>

    <file>..\..\..\ttcn\LibSip\xsd\Ims3gpp.xsd</file>

    <type>xsd</type>

    <sh>9A74BB2583970D59D31128C32EB18622</sh>

   </script>

   <script>

    <name>MCID</name>

    <file>..\..\..\ttcn\LibSip\xsd\MCID.xsd</file>

    <type>xsd</type>

    <sh>5E518838C868CF3B7545940359C464FE</sh>

   </script>

   <script>

    <name>OIP_OIR</name>

    <file>..\..\..\ttcn\LibSip\xsd\OIP-OIR.xsd</file>

    <type>xsd</type>

    <sh>746F697EF018430CA0836908F2EFC995</sh>

   </script>

   <script>

    <name>PSTN</name>

    <file>..\..\..\ttcn\LibSip\xsd\PSTN.xsd</file>

    <type>xsd</type>

    <sh>39AE6251D458DD895DAC2FEF7A13B2E8</sh>

   </script>

   <script>

    <name>ResourceList</name>

    <file>..\..\..\ttcn\LibSip\xsd\ResourceList.xsd</file>

    <type>xsd</type>

    <sh>5A2265837B107C089111A583FF64E2C2</sh>

   </script>

   <script>

    <name>simservs</name>

    <file>..\..\..\ttcn\LibSip\xsd\simservs.xsd</file>

    <type>xsd</type>

    <sh>90A00692BED785850F26068D6CE3A60D</sh>

   </script>

   <script>

    <name>SupplementaryServices</name>

    <file>..\..\..\ttcn\LibSip\xsd\SupplementaryServices.xsd</file>

    <type>xsd</type>

    <sh>3828CFE2404CE46C25D411CE275879FE</sh>

   </script>

   <script>

    <name>TIP_TIR</name>

    <file>..\..\..\ttcn\LibSip\xsd\TIP-TIR.xsd</file>

    <type>xsd</type>

    <sh>90EFFD6A2F9AF7CCCE37F21B4A9F207E</sh>

   </script>

   <script>

    <name>xdm_commonPolicy_v1_0</name>

    <file>..\..\..\ttcn\LibSip\xsd\xdm_commonPolicy-v1_0.xsd</file>

    <type>xsd</type>

    <sh>3F65D9E0C81A4A4297C692427DAA4D38</sh>

   </script>

   <script>

    <name>xml</name>

    <file>..\..\..\ttcn\LibSip\xsd\xml.xsd</file>

    <type>xsd</type>

    <sh>44B9B10D6CC7BC2A8CAC4C9417E05F2B</sh>

   </script>

   <script>

    <name>LibIms_Interface1</name>

    <file>..\..\..\ttcn\LibIms\ttcn\LibIms_Interface.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_Templates</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_Templates.ttcn</file>

    <name>LibIms_PIXITS1</name>

    <file>..\..\..\ttcn\LibIms\ttcn\LibIms_PIXITS.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>LibSip_XMLTypes</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\LibSip_XMLTypes.ttcn</file>

    <name>LibIms_SIPTypesAndValues1</name>

    <file>..\..\..\ttcn\LibIms\ttcn\LibIms_SIPTypesAndValues.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>XSDAUX</name>

    <file>..\..\..\ttcn\LibSipWithoutXSD\ttcn\XSDAUX.ttcn</file>

    <name>LibIms_Steps1</name>

    <file>..\..\..\ttcn\LibIms\ttcn\LibIms_Steps.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>AtsImsIot_TestCases_RCS</name>

    <file>..\..\..\ttcn\AtsImsIot\AtsImsIot_TestCases_RCS.ttcn</file>

    <name>LibIms_Templates1</name>

    <file>..\..\..\ttcn\LibIms\ttcn\LibIms_Templates.ttcn</file>

    <type>ttcn3</type>

   </script>

   <script>

    <name>XSD</name>

    <file>XSD.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>urnietfparamsxmlnsresource_lists</name>

    <file>urnietfparamsxmlnsresource_lists.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>httpuri_etsi_orgngnparamsxmlsimservsmcid</name>

    <file>httpuri_etsi_orgngnparamsxmlsimservsmcid.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>httpwww_w3_orgXML1998namespace</name>

    <file>httpwww_w3_orgXML1998namespace.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>urnietfparamsxmlnscommon_policy</name>

    <file>urnietfparamsxmlnscommon_policy.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>httpuri_etsi_orgngnparamsxmlcomm_div_info</name>

    <file>httpuri_etsi_orgngnparamsxmlcomm_div_info.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>httpuri_etsi_orgngnparamsxmlsimservsxcap</name>

    <file>httpuri_etsi_orgngnparamsxmlsimservsxcap.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>urnietfparamsxmlnsconference_info</name>

    <file>urnietfparamsxmlnsconference_info.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>NoTargetNamespace</name>

    <file>NoTargetNamespace.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>httpuri_etsi_orgngnparamsxmlsimservspstn</name>

    <file>httpuri_etsi_orgngnparamsxmlsimservspstn.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>urn3gppnscw1_0</name>

    <file>urn3gppnscw1_0.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

   <script>

    <name>urnomaxmlxdmcommon_policy</name>

    <file>urnomaxmlxdmcommon_policy.tcgen</file>

    <type>ttcn3</type>

    <generated />

   </script>

  </items>

 </scripts>
@@ -231,7 +405,6 @@ 
  <sa_count>1</sa_count>

  <rtime>20</rtime>

  <codec_type>dll</codec_type>

 </ttcn3_settings>

  <enc>

   <plain>

    <byte_order>le</byte_order>
@@ -254,4 +427,5 @@ 
    <any>none</any>

   </plain>

  </enc>

 </ttcn3_settings>

</solution>
 
 No newline at end of file

adapter/MMagic/STF407_ATS/STF407_ATS.mmsln.user

+18 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<user_space>

 <logs>

  <items />

  <items>

   <log>Session201010181618332\session_log.xmmlog</log>

  </items>

 </logs>

 <open>

  <scripts>

   <item>

    <name>LibIot_PIXITS</name>

    <name>CDIV</name>

    <tab>

     <pos>1</pos>

     <ln>217</ln>

     <pos>3</pos>

     <ln>0</ln>

     <crln>0</crln>

     <crcl>0</crcl>

    </tab>

   </item>

   <item>

    <name>cug</name>

    <tab>

     <pos>2</pos>

     <active />

     <ln>0</ln>

     <crln>0</crln>

     <crcl>0</crcl>

    </tab>

   </item>

  </scripts>