Commit fd581dda authored by Lev Walkin's avatar Lev Walkin

added LDAPv4 and MEGACO

parent 4bf96b9b
...@@ -54,7 +54,6 @@ my %binaryDecoders = ( ...@@ -54,7 +54,6 @@ my %binaryDecoders = (
typeExt => 'X.509 Certificate', typeExt => 'X.509 Certificate',
description => 'X.509 in DER (not PEM!)', description => 'X.509 in DER (not PEM!)',
exe => 'x509dump', exe => 'x509dump',
cmdopts => '-x',
msg => '' msg => ''
}, },
...@@ -64,7 +63,6 @@ my %binaryDecoders = ( ...@@ -64,7 +63,6 @@ my %binaryDecoders = (
typeExt => 'GSM TAP3-11 data', typeExt => 'GSM TAP3-11 data',
description => 'GSM TAP3-11 binary file', description => 'GSM TAP3-11 binary file',
exe => 'tap3dump-11', exe => 'tap3dump-11',
cmdopts => '-x',
msg => '' msg => ''
}, },
...@@ -74,7 +72,6 @@ my %binaryDecoders = ( ...@@ -74,7 +72,6 @@ my %binaryDecoders = (
typeExt => 'GSM TAP3-10 data', typeExt => 'GSM TAP3-10 data',
description => 'GSM TAP3-10 binary file', description => 'GSM TAP3-10 binary file',
exe => 'tap3dump-10', exe => 'tap3dump-10',
cmdopts => '-x',
msg => '' msg => ''
}, },
...@@ -84,21 +81,37 @@ my %binaryDecoders = ( ...@@ -84,21 +81,37 @@ my %binaryDecoders = (
typeExt => 'GSM TAP3-09 data', typeExt => 'GSM TAP3-09 data',
description => 'GSM TAP3-09 binary file', description => 'GSM TAP3-09 binary file',
exe => 'tap3dump-09', exe => 'tap3dump-09',
cmdopts => '-x',
msg => '' msg => ''
}, },
mheg5 => { order => 5, ldap3 => { order => 5,
shorder => 5, shorder => 5,
type => 'LDAPv3',
typeExt => 'IETF LDAPv3 message',
description => 'IETF LDAPv3 message',
exe => 'ldap3dump',
msg => ''
},
megaco => { order => 6,
shorder => 6,
type => 'MEGACO',
typeExt => 'MEGACO (H.248.1) data',
description => 'MEGACO (H.248.1) message',
exe => 'megacoDump',
msg => ''
},
mheg5 => { order => 7,
shorder => 7,
type => 'MHEG-5', type => 'MHEG-5',
typeExt => 'ISO MHEG-5 data', typeExt => 'ISO MHEG-5 data',
description => 'ISO MHEG-5 stream file', description => 'ISO MHEG-5 stream file',
exe => 'mheg5dump', exe => 'mheg5dump',
cmdopts => '-x',
msg => '' msg => ''
}, },
ber => { order => 6, ber => { order => 8,
shorder => 1, shorder => 1,
type => BER, type => BER,
typeExt => 'BER encoded data', typeExt => 'BER encoded data',
...@@ -109,52 +122,52 @@ my %binaryDecoders = ( ...@@ -109,52 +122,52 @@ my %binaryDecoders = (
}, },
rrcDLCCCH => { order => -1, # Not automatic rrcDLCCCH => { order => -1, # Not automatic
shorder => 7, shorder => 9,
type => 'RRC DL-CCCH-Message', type => 'RRC DL-CCCH-Message',
typeExt => 'RRC DL-CCCH-Message frame', typeExt => 'RRC DL-CCCH-Message frame',
description => '3GPP RRC DL-CCCH-Message', description => '3GPP RRC DL-CCCH-Message',
exe => 'rrc-dump', exe => 'rrc-dump',
cmdopts => '-p DL-CCCH-Message -oxer', cmdopts => '-p DL-CCCH-Message',
msg => '' msg => ''
}, },
rrcULCCCH => { order => -1, rrcULCCCH => { order => -1,
shorder => 8, shorder => 10,
type => 'RRC UL-CCCH-Message', type => 'RRC UL-CCCH-Message',
typeExt => 'RRC UL-CCCH-Message frame', typeExt => 'RRC UL-CCCH-Message frame',
description => '3GPP RRC UL-CCCH-Message', description => '3GPP RRC UL-CCCH-Message',
exe => 'rrc-dump', exe => 'rrc-dump',
cmdopts => '-p UL-CCCH-Message -oxer', cmdopts => '-p UL-CCCH-Message',
msg => '' msg => ''
}, },
rrcDLDCCH => { order => -1, rrcDLDCCH => { order => -1,
shorder => 9, shorder => 11,
type => 'RRC DL-DCCH-Message -oxer', type => 'RRC DL-DCCH-Message',
typeExt => 'RRC DL-DCCH-Message frame', typeExt => 'RRC DL-DCCH-Message frame',
description => '3GPP RRC DL-DCCH-Message', description => '3GPP RRC DL-DCCH-Message',
exe => 'rrc-dump', exe => 'rrc-dump',
cmdopts => '-p DL-DCCH-Message -oxer', cmdopts => '-p DL-DCCH-Message',
msg => '' msg => ''
}, },
rrcULDCCH => { order => -1, rrcULDCCH => { order => -1,
shorder => 10, shorder => 12,
type => 'RRC UL-DCCH-Message', type => 'RRC UL-DCCH-Message',
typeExt => 'RRC UL-DCCH-Message frame', typeExt => 'RRC UL-DCCH-Message frame',
description => '3GPP RRC UL-DCCH-Message', description => '3GPP RRC UL-DCCH-Message',
exe => 'rrc-dump', exe => 'rrc-dump',
cmdopts => '-p UL-DCCH-Message -oxer', cmdopts => '-p UL-DCCH-Message',
msg => '' msg => ''
}, },
rrcPCCH => { order => -1, rrcPCCH => { order => -1,
shorder => 11, shorder => 13,
type => 'RRC PCCH-Message', type => 'RRC PCCH-Message',
typeExt => 'RRC PCCH-Message frame', typeExt => 'RRC PCCH-Message frame',
description => '3GPP RRC PCCH-Message', description => '3GPP RRC PCCH-Message',
exe => 'rrc-dump', exe => 'rrc-dump',
cmdopts => '-p PCCH-Message -oxer', cmdopts => '-p PCCH-Message',
msg => '' msg => ''
} }
...@@ -565,9 +578,9 @@ if($#gotSafeNames >= 0) { ...@@ -565,9 +578,9 @@ if($#gotSafeNames >= 0) {
next unless ($fType eq 'auto' or $fType eq $t); next unless ($fType eq 'auto' or $fType eq $t);
next if($fType eq 'auto' and $dec{order} < 0); next if($fType eq 'auto' and $dec{order} < 0);
my $options = $dec{cmdopts} . ($specOpts{$t} || ""); my $options = $dec{cmdopts} . ($specOpts{$t} || "");
if(($dec{type} ne 'BER') && optGet('optNoXER')) { if(($dec{type} ne 'BER')) {
$options =~ s/-x/-p/g; # Old way $options .= ' -otext' if optGet('optText');
$options =~ s/-oxer/-otext/g; # New way $options .= ' -1' if optGet('optOnly1');
} }
my $ec = system("$SUIDHelper $TMPDIR $inChDir $dec{exe} $options @gotSafeNames > $TMPDIR/$inChDir/+UNBER.tmp 2>&1"); my $ec = system("$SUIDHelper $TMPDIR $inChDir $dec{exe} $options @gotSafeNames > $TMPDIR/$inChDir/+UNBER.tmp 2>&1");
next if ($ec != 0 and $t ne $fType next if ($ec != 0 and $t ne $fType
...@@ -691,7 +704,7 @@ function explanation(id, showFull) { ...@@ -691,7 +704,7 @@ function explanation(id, showFull) {
<FORM METHOD=POST NAME=form ACTION=$myName ENCTYPE="multipart/form-data"> <FORM METHOD=POST NAME=form ACTION=$myName ENCTYPE="multipart/form-data">
<DIV STYLE="width: 100%;"> <DIV STYLE="width: 100%;">
<DIV ID=arrow>&rArr;</DIV><DIV ID=aarr>Pick the ASN.1 module text or binary encoded data file:<BR> <DIV ID=arrow>&rArr;</DIV><DIV ID=aarr><b>Pick</b> the ASN.1 module text or binary encoded data file:<BR>
<SELECT NAME=fileType onchange="return fileTypeChanged(this);"> <SELECT NAME=fileType onchange="return fileTypeChanged(this);">
<OPTION VALUE=auto>Autodetect file type... <OPTION VALUE=auto>Autodetect file type...
<OPTION VALUE=asn1>ASN.1 specification text ... <OPTION VALUE=asn1>ASN.1 specification text ...
...@@ -705,7 +718,7 @@ foreach my $t (sort { $binaryDecoders{$a}{shorder} ...@@ -705,7 +718,7 @@ foreach my $t (sort { $binaryDecoders{$a}{shorder}
if(!$notauto && $dec{order} < 0) { if(!$notauto && $dec{order} < 0) {
$notauto = 1; $notauto = 1;
$form .= "<OPTION ID=noauto VALUE=no DISABLED=\"disabled\">"; $form .= "<OPTION ID=noauto VALUE=no DISABLED=\"disabled\">";
$form .= "--- not autodetectable: ---"; $form .= "--- not autodetectable (PER): ---";
$form .= "\n"; $form .= "\n";
next; next;
} }
...@@ -719,7 +732,7 @@ $form .= << "EOM"; ...@@ -719,7 +732,7 @@ $form .= << "EOM";
</DIV> </DIV>
<DIV ID="options-asn" STYLE="visibility: visible;"> <DIV ID="options-asn" STYLE="visibility: visible;">
<DIV ID=arrow>&rArr;</DIV><DIV ID=aarr>Or paste the ASN.1 text into the area below:$rtt <DIV ID=arrow>&rArr;</DIV><DIV ID=aarr><b>Or paste</b> the ASN.1 text into the area below:$rtt
<BR> <BR>
<TEXTAREA NAME=text ROWS=16 COLS=60 STYLE="font-family: courier; font-size: 11px;"> <TEXTAREA NAME=text ROWS=16 COLS=60 STYLE="font-family: courier; font-size: 11px;">
EOM EOM
...@@ -765,7 +778,8 @@ These options may be used to control the compiler's behavior:<BR> ...@@ -765,7 +778,8 @@ These options may be used to control the compiler's behavior:<BR>
<DIV ID=options-bin CLASS=options> <DIV ID=options-bin CLASS=options>
<DIV CLASS=optsbar> <DIV CLASS=optsbar>
<INPUT TYPE=checkbox NAME=optNoXER> Generate simple text dump instead of XER <INPUT TYPE=checkbox NAME=optOnly1> Process only the first PDU in file<br>
<INPUT TYPE=checkbox NAME=optText> Generate simple text dump instead of XML (XER)<br>
</DIV> </DIV>
</DIV> <!-- options-bin --> </DIV> <!-- options-bin -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment