diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2008-01-03 14:35:45 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2008-01-03 14:35:45 +0000 |
| commit | 41aa70797bdfc679c0df9a14f71b72368d5f66c2 (patch) | |
| tree | 5595d7e0df1cd16b4aecbd239902099811176983 | |
| parent | 3523d6c825f4ae33296fe0c97356d7de49992322 (diff) | |
Fix up compilation errors.
svn path=/trunk/; revision=24003
| -rw-r--r-- | asn1/s1ap/Makefile.common | 2 | ||||
| -rw-r--r-- | asn1/s1ap/packet-s1ap-template.c | 4 | ||||
| -rw-r--r-- | asn1/s1ap/s1ap.cnf | 25 | ||||
| -rw-r--r-- | asn1/x2ap/X2AP-IEs.asn | 4 |
4 files changed, 12 insertions, 23 deletions
diff --git a/asn1/s1ap/Makefile.common b/asn1/s1ap/Makefile.common index 2d48cd3542..1aa56c9877 100644 --- a/asn1/s1ap/Makefile.common +++ b/asn1/s1ap/Makefile.common @@ -25,7 +25,7 @@ PROTOCOL_NAME = s1ap DISSECTOR_FILES = \ packet-$(PROTOCOL_NAME).c -NEED_PACKET_PROTO_H = 0 +# NEED_PACKET_PROTO_H = 1 EXT_ASN_FILE_LIST = diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 89b11e43a5..9191dc4f44 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -1,5 +1,5 @@ /* packet-s1ap.c - * Routines for E-UTRAN) S1 Application Protocol (S1AP) packet dissection + * Routines for E-UTRAN S1 Application Protocol (S1AP) packet dissection * Copyright 2007, Anders Broman <anders.broman@ericsson.com> * * $Id: packet-s1ap-template.c 22778 2007-09-03 16:40:51Z etxrab $ @@ -43,8 +43,6 @@ #include "packet-ber.h" #include "packet-per.h" -#include "packet-gsm_map.h" -#include "packet-s1ap.h" #include "packet-e212.h" #include "packet-sccp.h" diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index ceb1ca8429..eabfcbd825 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -105,24 +105,13 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #RAB-IE-ContainerList { S1AP-PROTOCOL-IES : IEsSetParam } ::= ProtocolIE-ContainerList { 1, maxNrOfRABs, {IEsSetParam} } #ProtocolError-IE-ContainerList { S1AP-PROTOCOL-IES : IEsSetParam } ::= ProtocolIE-ContainerList { 1, maxNrOfRABs, {IEsSetParam} } -#.FN_BODY ProtocolError-IE-ContainerList - asn1_stack_frame_push(%(ACTX)s, "ProtocolIE-ContainerList"); - asn1_param_push_integer(%(ACTX)s, 1); - asn1_param_push_integer(%(ACTX)s, maxNrOfRABs); -%(DEFAULT_BODY)s - asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerList"); -#.END - -#.END - -#.FN_BODY NAS-PDU VAL_PTR = &nas_pdu_tvb - tvbuff_t *nas_pdu_tvb=NULL; - -%(DEFAULT_BODY)s - - if (nas_pdu_tvb) - dissector_try_port(nas_pdu_dissector_table, 0x1, nas_pdu_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree)); -#.END +# FN_BODY ProtocolError-IE-ContainerList +# asn1_stack_frame_push(%(ACTX)s, "ProtocolIE-ContainerList"); +# asn1_param_push_integer(%(ACTX)s, 1); +# asn1_param_push_integer(%(ACTX)s, maxNrOfRABs); +#%(DEFAULT_BODY)s +# asn1_stack_frame_pop(%(ACTX)s, "ProtocolIE-ContainerList"); +# END # following construction is not supported by asn2wrs # PLMNidentity ::= TBCD-STRING (SIZE (3)) diff --git a/asn1/x2ap/X2AP-IEs.asn b/asn1/x2ap/X2AP-IEs.asn index 8f7e455fb4..f9998b6a5b 100644 --- a/asn1/x2ap/X2AP-IEs.asn +++ b/asn1/x2ap/X2AP-IEs.asn @@ -294,7 +294,9 @@ RRC-Context ::= OCTET STRING -- S -SAE-Bearer-BitRate ::= INTEGER (0..210000000000) +--SAE-Bearer-BitRate ::= INTEGER (0..210000000000) +-- NOTE THIS needs changes in packet-per.c I think !!!! +SAE-Bearer-BitRate ::= INTEGER (0..4294967295) SAE-BearerLevel-QoS-Parameters ::= SEQUENCE { label INTEGER (1..256), |