aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-07-23 19:09:21 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-07-23 19:09:21 +0800
commite2c1520a712b529bacd6198e7725543ad8be0165 (patch)
tree763411aac6877bfea0fec97336930922bd33b321
parentdbd16fe59a1aefac4df77c7e31ffba87d74d9659 (diff)
nat: u_int16_t -> uint16_t
-rw-r--r--openbsc/src/nat/bsc_mgcp_utils.c4
-rw-r--r--openbsc/tests/bsc-nat/bsc_nat_test.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c
index 48be904cf..32d988e1d 100644
--- a/openbsc/src/nat/bsc_mgcp_utils.c
+++ b/openbsc/src/nat/bsc_mgcp_utils.c
@@ -41,7 +41,7 @@ int bsc_mgcp_assign(struct sccp_connections *con, struct msgb *msg)
{
struct sccp_connections *mcon;
struct tlv_parsed tp;
- u_int16_t cic;
+ uint16_t cic;
uint8_t timeslot;
uint8_t multiplex;
int combined;
@@ -62,7 +62,7 @@ int bsc_mgcp_assign(struct sccp_connections *con, struct msgb *msg)
return -1;
}
- cic = ntohs(*(u_int16_t *)TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE));
+ cic = ntohs(*(uint16_t *)TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE));
timeslot = cic & 0x1f;
multiplex = (cic & ~0x1f) >> 5;
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index e39ec0c3c..6771b314e 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -132,7 +132,7 @@ static const uint8_t pag_resp[] = {
struct filter_result {
const uint8_t *data;
- const u_int16_t length;
+ const uint16_t length;
const int dir;
const int result;
};