cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

rsl: fix the unaligned memory access 

the armv5 can do 32bit/16bit reads only from the aligned address
use tlv.h macro to copy data to local variable

Signed-off-by: Nicolas J. Bouliane <nicolas.bouliane@nutaq.com>
This commit is contained in:
Nicolas J. Bouliane 2013-04-22 07:45:13 -04:00 committed by Holger Hans Peter Freyther
parent 19cefb0097
commit fcdba6bfac
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/rsl.c
View File

@ -1093,7 +1093,6 @@ static int rsl_tx_ipac_XXcx_ack(struct gsm_lchan *lchan, int inc_pt2,
{ {
struct msgb *msg; struct msgb *msg;
uint8_t chan_nr = gsm_lchan2chan_nr(lchan); uint8_t chan_nr = gsm_lchan2chan_nr(lchan);
uint32_t *att_ip;
const char *name; const char *name;
struct in_addr ia; struct in_addr ia;
@ -1120,8 +1119,7 @@ static int rsl_tx_ipac_XXcx_ack(struct gsm_lchan *lchan, int inc_pt2,
/* locally bound IP */ /* locally bound IP */
msgb_v_put(msg, RSL_IE_IPAC_LOCAL_IP); msgb_v_put(msg, RSL_IE_IPAC_LOCAL_IP);
att_ip = (uint32_t *) msgb_put(msg, sizeof(uint32_t)); msgb_put_u32(msg, lchan->abis_ip.bound_ip);
*att_ip = htonl(lchan->abis_ip.bound_ip);
/* locally bound port */ /* locally bound port */
msgb_tv16_put(msg, RSL_IE_IPAC_LOCAL_PORT, msgb_tv16_put(msg, RSL_IE_IPAC_LOCAL_PORT,
@ -1203,11 +1201,9 @@ static int tx_ipac_XXcx_nack(struct gsm_lchan *lchan, uint8_t cause,
return -ENOMEM; return -ENOMEM;
if (inc_ipport) { if (inc_ipport) {
uint32_t *att_ip;
/* remote IP */ /* remote IP */
msgb_v_put(msg, RSL_IE_IPAC_REMOTE_IP); msgb_v_put(msg, RSL_IE_IPAC_REMOTE_IP);
att_ip = (uint32_t *) msgb_put(msg, sizeof(uint32_t)); msgb_put_u32(msg, lchan->abis_ip.connect_ip);
*att_ip = htonl(lchan->abis_ip.connect_ip);
/* remote port */ /* remote port */
msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT, msgb_tv16_put(msg, RSL_IE_IPAC_REMOTE_PORT,
@ -1252,8 +1248,8 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg)
struct gsm_lchan *lchan = msg->lchan; struct gsm_lchan *lchan = msg->lchan;
struct gsm_bts_role_bts *btsb = bts_role_bts(msg->lchan->ts->trx->bts); struct gsm_bts_role_bts *btsb = bts_role_bts(msg->lchan->ts->trx->bts);
const uint8_t *payload_type, *speech_mode, *payload_type2; const uint8_t *payload_type, *speech_mode, *payload_type2;
const uint32_t *connect_ip; uint32_t connect_ip = 0;
const uint16_t *connect_port; uint16_t connect_port = 0;
int rc, inc_ip_port = 0, port; int rc, inc_ip_port = 0, port;
char *name; char *name;
@ -1271,8 +1267,16 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg)
speech_mode = TLVP_VAL(&tp, RSL_IE_IPAC_SPEECH_MODE); speech_mode = TLVP_VAL(&tp, RSL_IE_IPAC_SPEECH_MODE);
payload_type = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD); payload_type = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD);
payload_type2 = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD2); payload_type2 = TLVP_VAL(&tp, RSL_IE_IPAC_RTP_PAYLOAD2);
connect_ip = (uint32_t *) TLVP_VAL(&tp, RSL_IE_IPAC_REMOTE_IP);
connect_port = (uint16_t *) TLVP_VAL(&tp, RSL_IE_IPAC_REMOTE_PORT); if (TLVP_PRESENT(&tp, RSL_IE_IPAC_REMOTE_IP))
connect_ip = tlvp_val32_unal(&tp, RSL_IE_IPAC_REMOTE_IP);
else
LOGP(DRSL, LOGL_NOTICE, "CRCX does not specify a remote IP\n");
if (TLVP_PRESENT(&tp, RSL_IE_IPAC_REMOTE_PORT))
connect_port = tlvp_val16_unal(&tp, RSL_IE_IPAC_REMOTE_PORT);
else
LOGP(DRSL, LOGL_NOTICE, "CRCX does not specify a remote port\n");
if (dch->c.msg_type == RSL_MT_IPAC_CRCX && connect_ip && connect_port) if (dch->c.msg_type == RSL_MT_IPAC_CRCX && connect_ip && connect_port)
inc_ip_port = 1; inc_ip_port = 1;
@ -1354,14 +1358,14 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg)
/* Special rule: If connect_ip == 0.0.0.0, use RSL IP /* Special rule: If connect_ip == 0.0.0.0, use RSL IP
* address */ * address */
if (*connect_ip == 0) { if (connect_ip == 0) {
struct ipabis_link *link = struct ipabis_link *link =
lchan->ts->trx->rsl_link; lchan->ts->trx->rsl_link;
ia.s_addr = htonl(link->ip); ia.s_addr = htonl(link->ip);
} else } else
ia.s_addr = *connect_ip; ia.s_addr = connect_ip;
rc = osmo_rtp_socket_connect(lchan->abis_ip.rtp_socket, rc = osmo_rtp_socket_connect(lchan->abis_ip.rtp_socket,
inet_ntoa(ia), ntohs(*connect_port)); inet_ntoa(ia), ntohs(connect_port));
if (rc < 0) { if (rc < 0) {
LOGP(DRSL, LOGL_ERROR, LOGP(DRSL, LOGL_ERROR,
"%s Failed to connect RTP/RTCP sockets\n", "%s Failed to connect RTP/RTCP sockets\n",
@ -1374,7 +1378,7 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg)
} }
/* save IP address and port number */ /* save IP address and port number */
lchan->abis_ip.connect_ip = ntohl(ia.s_addr); lchan->abis_ip.connect_ip = ntohl(ia.s_addr);
lchan->abis_ip.connect_port = ntohs(*connect_port); lchan->abis_ip.connect_port = ntohs(connect_port);
} else { } else {
/* FIXME: discard all codec frames */ /* FIXME: discard all codec frames */