From dbd16fe59a1aefac4df77c7e31ffba87d74d9659 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 23 Jul 2010 19:08:55 +0800 Subject: nat: u_int8_t -> uint8_t --- openbsc/tests/bsc-nat/bsc_data.c | 28 ++++++++++++++-------------- openbsc/tests/bsc-nat/bsc_nat_test.c | 30 +++++++++++++++--------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'openbsc/tests') diff --git a/openbsc/tests/bsc-nat/bsc_data.c b/openbsc/tests/bsc-nat/bsc_data.c index 34242db8c..6700b0ca2 100644 --- a/openbsc/tests/bsc-nat/bsc_data.c +++ b/openbsc/tests/bsc-nat/bsc_data.c @@ -1,7 +1,7 @@ /* test data */ /* BSC -> MSC, CR */ -static const u_int8_t bsc_cr[] = { +static const uint8_t bsc_cr[] = { 0x00, 0x2e, 0xfd, 0x01, 0x00, 0x00, 0x15, 0x02, 0x02, 0x04, 0x02, 0x42, 0xfe, 0x0f, 0x21, 0x00, 0x1f, 0x57, 0x05, @@ -10,7 +10,7 @@ static const u_int8_t bsc_cr[] = { 0x90, 0x20, 0x1d, 0x50, 0x08, 0x29, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 }; -static const u_int8_t bsc_cr_patched[] = { +static const uint8_t bsc_cr_patched[] = { 0x00, 0x2e, 0xfd, 0x01, 0x00, 0x00, 0x05, 0x02, 0x02, 0x04, 0x02, 0x42, 0xfe, 0x0f, 0x21, 0x00, 0x1f, 0x57, 0x05, @@ -20,60 +20,60 @@ static const u_int8_t bsc_cr_patched[] = { 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 }; /* CC, MSC -> BSC */ -static const u_int8_t msc_cc[] = { +static const uint8_t msc_cc[] = { 0x00, 0x0a, 0xfd, 0x02, 0x00, 0x00, 0x05, 0x01, 0x1f, 0xe4, 0x02, 0x01, 0x00 }; -static const u_int8_t msc_cc_patched[] = { +static const uint8_t msc_cc_patched[] = { 0x00, 0x0a, 0xfd, 0x02, 0x00, 0x00, 0x15, 0x01, 0x1f, 0xe4, 0x02, 0x01, 0x00 }; /* Classmark, BSC -> MSC */ -static const u_int8_t bsc_dtap[] = { +static const uint8_t bsc_dtap[] = { 0x00, 0x17, 0xfd, 0x06, 0x01, 0x1f, 0xe4, 0x00, 0x01, 0x10, 0x00, 0x0e, 0x54, 0x12, 0x03, 0x50, 0x18, 0x93, 0x13, 0x06, 0x60, 0x14, 0x45, 0x00, 0x81, 0x00 }; -static const u_int8_t bsc_dtap_patched[] = { +static const uint8_t bsc_dtap_patched[] = { 0x00, 0x17, 0xfd, 0x06, 0x01, 0x1f, 0xe4, 0x00, 0x01, 0x10, 0x00, 0x0e, 0x54, 0x12, 0x03, 0x50, 0x18, 0x93, 0x13, 0x06, 0x60, 0x14, 0x45, 0x00, 0x81, 0x00 }; /* Clear command, MSC -> BSC */ -static const u_int8_t msc_dtap[] = { +static const uint8_t msc_dtap[] = { 0x00, 0x0d, 0xfd, 0x06, 0x00, 0x00, 0x05, 0x00, 0x01, 0x06, 0x00, 0x04, 0x20, 0x04, 0x01, 0x09 }; -static const u_int8_t msc_dtap_patched[] = { +static const uint8_t msc_dtap_patched[] = { 0x00, 0x0d, 0xfd, 0x06, 0x00, 0x00, 0x15, 0x00, 0x01, 0x06, 0x00, 0x04, 0x20, 0x04, 0x01, 0x09 }; /*RLSD, MSC -> BSC */ -static const u_int8_t msc_rlsd[] = { +static const uint8_t msc_rlsd[] = { 0x00, 0x0a, 0xfd, 0x04, 0x00, 0x00, 0x05, 0x01, 0x1f, 0xe4, 0x00, 0x01, 0x00 }; -static const u_int8_t msc_rlsd_patched[] = { +static const uint8_t msc_rlsd_patched[] = { 0x00, 0x0a, 0xfd, 0x04, 0x00, 0x00, 0x15, 0x01, 0x1f, 0xe4, 0x00, 0x01, 0x00 }; /* RLC, BSC -> MSC */ -static const u_int8_t bsc_rlc[] = { +static const uint8_t bsc_rlc[] = { 0x00, 0x07, 0xfd, 0x05, 0x01, 0x1f, 0xe4, 0x00, 0x00, 0x15 }; -static const u_int8_t bsc_rlc_patched[] = { +static const uint8_t bsc_rlc_patched[] = { 0x00, 0x07, 0xfd, 0x05, 0x01, 0x1f, 0xe4, 0x00, 0x00, 0x05 }; /* a paging command */ -static const u_int8_t paging_by_lac_cmd[] = { +static const uint8_t paging_by_lac_cmd[] = { 0x00, 0x22, 0xfd, 0x09, 0x00, 0x03, 0x07, 0x0b, 0x04, 0x43, 0x02, 0x00, 0xfe, 0x04, 0x43, 0x5c, 0x00, 0xfe, 0x12, 0x00, @@ -82,7 +82,7 @@ static const u_int8_t paging_by_lac_cmd[] = { 0x15 }; /* an assignment command */ -static const u_int8_t ass_cmd[] = { +static const uint8_t ass_cmd[] = { 0x00, 0x12, 0xfd, 0x06, 0x00, 0x00, 0x49, 0x00, 0x01, 0x0b, 0x00, 0x09, 0x01, 0x0b, 0x03, 0x01, 0x0a, 0x11, 0x01, 0x00, diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c index d49ab6c93..e39ec0c3c 100644 --- a/openbsc/tests/bsc-nat/bsc_nat_test.c +++ b/openbsc/tests/bsc-nat/bsc_nat_test.c @@ -32,26 +32,26 @@ #include /* test messages for ipa */ -static u_int8_t ipa_id[] = { +static uint8_t ipa_id[] = { 0x00, 0x01, 0xfe, 0x06, }; /* SCCP messages are below */ -static u_int8_t gsm_reset[] = { +static uint8_t gsm_reset[] = { 0x00, 0x12, 0xfd, 0x09, 0x00, 0x03, 0x05, 0x07, 0x02, 0x42, 0xfe, 0x02, 0x42, 0xfe, 0x06, 0x00, 0x04, 0x30, 0x04, 0x01, 0x20, }; -static const u_int8_t gsm_reset_ack[] = { +static const uint8_t gsm_reset_ack[] = { 0x00, 0x13, 0xfd, 0x09, 0x00, 0x03, 0x07, 0x0b, 0x04, 0x43, 0x01, 0x00, 0xfe, 0x04, 0x43, 0x5c, 0x00, 0xfe, 0x03, 0x00, 0x01, 0x31, }; -static const u_int8_t gsm_paging[] = { +static const uint8_t gsm_paging[] = { 0x00, 0x20, 0xfd, 0x09, 0x00, 0x03, 0x07, 0x0b, 0x04, 0x43, 0x01, 0x00, 0xfe, 0x04, 0x43, 0x5c, 0x00, 0xfe, 0x10, @@ -60,7 +60,7 @@ static const u_int8_t gsm_paging[] = { }; /* BSC -> MSC connection open */ -static const u_int8_t bssmap_cr[] = { +static const uint8_t bssmap_cr[] = { 0x00, 0x2c, 0xfd, 0x01, 0x01, 0x02, 0x03, 0x02, 0x02, 0x04, 0x02, 0x42, 0xfe, 0x0f, 0x1f, 0x00, 0x1d, 0x57, 0x05, @@ -71,45 +71,45 @@ static const u_int8_t bssmap_cr[] = { }; /* MSC -> BSC connection confirm */ -static const u_int8_t bssmap_cc[] = { +static const uint8_t bssmap_cc[] = { 0x00, 0x0a, 0xfd, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, }; /* MSC -> BSC released */ -static const u_int8_t bssmap_released[] = { +static const uint8_t bssmap_released[] = { 0x00, 0x0e, 0xfd, 0x04, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00, 0x01, 0x0f, 0x02, 0x23, 0x42, 0x00, }; /* BSC -> MSC released */ -static const u_int8_t bssmap_release_complete[] = { +static const uint8_t bssmap_release_complete[] = { 0x00, 0x07, 0xfd, 0x05, 0x01, 0x02, 0x03, 0x00, 0x00, 0x03 }; /* both directions IT timer */ -static const u_int8_t connnection_it[] = { +static const uint8_t connnection_it[] = { 0x00, 0x0b, 0xfd, 0x10, 0x01, 0x02, 0x03, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, }; /* error in both directions */ -static const u_int8_t proto_error[] = { +static const uint8_t proto_error[] = { 0x00, 0x05, 0xfd, 0x0f, 0x22, 0x33, 0x44, 0x00, }; /* MGCP wrap... */ -static const u_int8_t mgcp_msg[] = { +static const uint8_t mgcp_msg[] = { 0x00, 0x03, 0xfc, 0x20, 0x20, 0x20, }; /* location updating request */ -static const u_int8_t bss_lu[] = { +static const uint8_t bss_lu[] = { 0x00, 0x2e, 0xfd, 0x01, 0x91, 0x45, 0x14, 0x02, 0x02, 0x04, 0x02, 0x42, 0xfe, 0x0f, 0x21, 0x00, 0x1f, 0x57, 0x05, @@ -131,7 +131,7 @@ static const uint8_t pag_resp[] = { }; struct filter_result { - const u_int8_t *data; + const uint8_t *data; const u_int16_t length; const int dir; const int result; @@ -253,7 +253,7 @@ static void test_filter(void) #include "bsc_data.c" -static void copy_to_msg(struct msgb *msg, const u_int8_t *data, unsigned int length) +static void copy_to_msg(struct msgb *msg, const uint8_t *data, unsigned int length) { msgb_reset(msg); msg->l2h = msgb_put(msg, length); @@ -567,7 +567,7 @@ static void test_mgcp_parse(void) } struct cr_filter { - const u_int8_t *data; + const uint8_t *data; int length; int result; int contype; -- cgit v1.2.3