sccp: u_int8_t -> uint8_t
diff --git a/openbsc/src/sccp/sccp.c b/openbsc/src/sccp/sccp.c
index f4335c0..f85257d 100644
--- a/openbsc/src/sccp/sccp.c
+++ b/openbsc/src/sccp/sccp.c
@@ -63,13 +63,13 @@
int (*read_cb)(struct msgb *, unsigned int, void *);
void *read_context;
- u_int8_t ssn;
+ uint8_t ssn;
struct llist_head callback;
};
static LLIST_HEAD(sccp_callbacks);
-static struct sccp_data_callback *_find_ssn(u_int8_t ssn)
+static struct sccp_data_callback *_find_ssn(uint8_t ssn)
{
struct sccp_data_callback *cb;
@@ -99,13 +99,13 @@
/*
* parsing routines
*/
-static int copy_address(struct sccp_address *addr, u_int8_t offset, struct msgb *msgb)
+static int copy_address(struct sccp_address *addr, uint8_t offset, struct msgb *msgb)
{
struct sccp_called_party_address *party;
int room = msgb_l2len(msgb) - offset;
- u_int8_t read = 0;
- u_int8_t length;
+ uint8_t read = 0;
+ uint8_t length;
if (room <= 0) {
LOGP(DSCCP, LOGL_ERROR, "Not enough room for an address: %u\n", room);
@@ -142,7 +142,7 @@
}
if (party->global_title_indicator) {
- LOGP(DSCCP, LOGL_ERROR, "GTI not supported %u\n", *(u_int8_t *)party);
+ LOGP(DSCCP, LOGL_ERROR, "GTI not supported %u\n", *(uint8_t *)party);
return -1;
}
@@ -158,7 +158,7 @@
|| addr->address.routing_indicator != 1) {
LOGP(DSCCP, LOGL_ERROR,
"Invalid called address according to 08.06: 0x%x 0x%x\n",
- *(u_int8_t *)&addr->address, addr->ssn);
+ *(uint8_t *)&addr->address, addr->ssn);
return -1;
}
@@ -172,7 +172,7 @@
u_int16_t read = 0;
while (room > read) {
- u_int8_t type = msgb->l2h[offset + read];
+ uint8_t type = msgb->l2h[offset + read];
if (type == SCCP_PNC_END_OF_OPTIONAL)
return 0;
@@ -181,7 +181,7 @@
return 0;
}
- u_int8_t length = msgb->l2h[offset + read + 1];
+ uint8_t length = msgb->l2h[offset + read + 1];
read += 2 + length;
@@ -227,7 +227,7 @@
if (check_address(&result->called) != 0) {
LOGP(DSCCP, LOGL_ERROR, "Invalid called address according to 08.06: 0x%x 0x%x\n",
- *(u_int8_t *)&result->called.address, result->called.ssn);
+ *(uint8_t *)&result->called.address, result->called.ssn);
return -1;
}
@@ -441,7 +441,7 @@
if (check_address(&result->called) != 0) {
LOGP(DSCCP, LOGL_ERROR, "Invalid called address according to 08.06: 0x%x 0x%x\n",
- *(u_int8_t *)&result->called.address, result->called.ssn);
+ *(uint8_t *)&result->called.address, result->called.ssn);
return -1;
}
@@ -450,7 +450,7 @@
if (check_address(&result->calling) != 0) {
LOGP(DSCCP, LOGL_ERROR, "Invalid called address according to 08.06: 0x%x 0x%x\n",
- *(u_int8_t *)&result->called.address, result->called.ssn);
+ *(uint8_t *)&result->called.address, result->called.ssn);
}
/* we don't have enough size for the data */
@@ -517,7 +517,7 @@
const struct sockaddr_sccp *out, struct msgb *payload)
{
struct sccp_data_unitdata *udt;
- u_int8_t *data;
+ uint8_t *data;
if (msgb_l3len(payload) > 256) {
LOGP(DSCCP, LOGL_ERROR, "The payload is too big for one udt\n");
@@ -642,7 +642,7 @@
{
struct msgb *msgb;
struct sccp_connection_refused *ref;
- u_int8_t *data;
+ uint8_t *data;
msgb = msgb_alloc_headroom(SCCP_MSG_SIZE,
SCCP_MSG_HEADROOM, "sccp ref");
@@ -687,7 +687,7 @@
{
struct msgb *response;
struct sccp_connection_confirm *confirm;
- u_int8_t *optional_data;
+ uint8_t *optional_data;
response = msgb_alloc_headroom(SCCP_MSG_SIZE,
SCCP_MSG_HEADROOM, "sccp confirm");
@@ -708,7 +708,7 @@
confirm->proto_class = 2;
confirm->optional_start = 1;
- optional_data = (u_int8_t *) msgb_put(response, 1);
+ optional_data = (uint8_t *) msgb_put(response, 1);
optional_data[0] = SCCP_PNC_END_OF_OPTIONAL;
return response;
}
@@ -735,8 +735,8 @@
{
struct msgb *request;
struct sccp_connection_request *req;
- u_int8_t *data;
- u_int8_t extra_size = 3 + 1;
+ uint8_t *data;
+ uint8_t extra_size = 3 + 1;
if (msg && (msgb_l3len(msg) < 3 || msgb_l3len(msg) > 130)) {
@@ -794,7 +794,7 @@
{
struct msgb *msgb;
struct sccp_data_form1 *dt1;
- u_int8_t *data;
+ uint8_t *data;
msgb = msgb_alloc_headroom(SCCP_MSG_SIZE,
SCCP_MSG_HEADROOM, "sccp dt1");
@@ -866,7 +866,7 @@
{
struct msgb *msg;
struct sccp_connection_released *rel;
- u_int8_t *data;
+ uint8_t *data;
msg = msgb_alloc_headroom(SCCP_MSG_SIZE, SCCP_MSG_HEADROOM,
"sccp: connection released");