summaryrefslogtreecommitdiffstats
path: root/src/shared/libosmocore/src
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2010-09-20 21:02:28 +0200
committerSylvain Munaut <tnt@246tNt.com>2010-09-20 21:02:28 +0200
commitfb91acbd636e461b0e4c743817ac322894bacfc7 (patch)
tree59f686849d2431196f4a54cc78e5faccce400e30 /src/shared/libosmocore/src
parentfae41cac5c4e112f107ff20be2253d8069823d7e (diff)
parent47ee693170d589f760c4a9c7a5c4ad0b289aa65d (diff)
Merge commit '47ee693170d589f760c4a9c7a5c4ad0b289aa65d'
Diffstat (limited to 'src/shared/libosmocore/src')
-rw-r--r--src/shared/libosmocore/src/gsm0808.c4
-rw-r--r--src/shared/libosmocore/src/gsm48_ie.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/shared/libosmocore/src/gsm0808.c b/src/shared/libosmocore/src/gsm0808.c
index 42a73b9f..636c2117 100644
--- a/src/shared/libosmocore/src/gsm0808.c
+++ b/src/shared/libosmocore/src/gsm0808.c
@@ -288,7 +288,7 @@ static const struct tlv_definition bss_att_tlvdef = {
[GSM0808_IE_EMLPP_PRIORITY] = { TLV_TYPE_TV },
[GSM0808_IE_CHANNEL_TYPE] = { TLV_TYPE_TLV },
[GSM0808_IE_PRIORITY] = { TLV_TYPE_TLV },
- [GSM0808_IE_CIRCUIT_IDENTITY_CODE] = { TLV_TYPE_TV },
+ [GSM0808_IE_CIRCUIT_IDENTITY_CODE] = { TLV_TYPE_FIXED, 2 },
[GSM0808_IE_DOWNLINK_DTX_FLAG] = { TLV_TYPE_TV },
[GSM0808_IE_INTERFERENCE_BAND_TO_USE] = { TLV_TYPE_TV },
[GSM0808_IE_CLASSMARK_INFORMATION_T2] = { TLV_TYPE_TLV },
@@ -296,7 +296,7 @@ static const struct tlv_definition bss_att_tlvdef = {
[GSM0808_IE_TALKER_FLAG] = { TLV_TYPE_T },
[GSM0808_IE_CONFIG_EVO_INDI] = { TLV_TYPE_TV },
[GSM0808_IE_LSA_ACCESS_CTRL_SUPPR] = { TLV_TYPE_TV },
- [GSM0808_IE_SERVICE_HANDOVER] = { TLV_TYPE_TV},
+ [GSM0808_IE_SERVICE_HANDOVER] = { TLV_TYPE_TLV },
[GSM0808_IE_ENCRYPTION_INFORMATION] = { TLV_TYPE_TLV },
[GSM0808_IE_CIPHER_RESPONSE_MODE] = { TLV_TYPE_TV },
[GSM0808_IE_CELL_IDENTIFIER] = { TLV_TYPE_TLV },
diff --git a/src/shared/libosmocore/src/gsm48_ie.c b/src/shared/libosmocore/src/gsm48_ie.c
index 71910c6e..0e270881 100644
--- a/src/shared/libosmocore/src/gsm48_ie.c
+++ b/src/shared/libosmocore/src/gsm48_ie.c
@@ -249,7 +249,8 @@ int gsm48_encode_called(struct msgb *msg,
int ret;
/* octet 3 */
- lv[1] = called->plan;
+ lv[1] = 0x80; /* no extension */
+ lv[1] |= called->plan;
lv[1] |= called->type << 4;
/* octet 4..N, octet 2 */