aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/ulp/ULP.asn
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2006-05-13 12:06:56 +0000
committerAnders Broman <anders.broman@ericsson.com>2006-05-13 12:06:56 +0000
commitecac136d4dad61579d4f47a19dcd594525e3ba9a (patch)
tree478574220645d2ea928e3ed7d833cfa65c1ebd7f /asn1/ulp/ULP.asn
parent7c4b8c8b888949808448c97405ef4e5679a069b1 (diff)
downloadwireshark-ecac136d4dad61579d4f47a19dcd594525e3ba9a.tar.gz
wireshark-ecac136d4dad61579d4f47a19dcd594525e3ba9a.tar.bz2
wireshark-ecac136d4dad61579d4f47a19dcd594525e3ba9a.zip
Make dissect_per_constrained_integer handle unaligned PER.
Add ULP TCP port preference decode IPv4/IPv6 fields. svn path=/trunk/; revision=18143
Diffstat (limited to 'asn1/ulp/ULP.asn')
-rw-r--r--asn1/ulp/ULP.asn8
1 files changed, 6 insertions, 2 deletions
diff --git a/asn1/ulp/ULP.asn b/asn1/ulp/ULP.asn
index 12bbbf7828..35cb1d647b 100644
--- a/asn1/ulp/ULP.asn
+++ b/asn1/ulp/ULP.asn
@@ -80,8 +80,12 @@ SlpSessionID ::= SEQUENCE {
slpId SLPAddress}
IPAddress ::= CHOICE {
- ipv4Address OCTET STRING(SIZE (4)),
- ipv6Address OCTET STRING(SIZE (16))}
+ ipv4Address IPv4Address,
+ ipv6Address IPv6Address
+ }
+
+IPv4Address ::= OCTET STRING(SIZE (4))
+IPv6Address ::= OCTET STRING(SIZE (16))
SLPAddress ::= CHOICE {iPAddress IPAddress,
fQDN FQDN,