aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/abis.c
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-05-22 22:00:45 +0200
committerHarald Welte <laforge@gnumonks.org>2011-05-22 22:00:45 +0200
commitcbda62ee76f7798804742965533ff525cf7562c6 (patch)
tree45395ae0eb147c9da6386a844d36dad1fec0d0f8 /src/common/abis.c
parent8a183fb4235cdd51b660380f7e05de40713bdfa8 (diff)
abis: use ipaccess protocol header from libosmogsm
Diffstat (limited to 'src/common/abis.c')
-rw-r--r--src/common/abis.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/abis.c b/src/common/abis.c
index 2e68d546..f70eb843 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -66,7 +66,7 @@ struct msgb *abis_msgb_alloc(int headroom)
{
struct msgb *nmsg;
- headroom += sizeof(struct ipabis_head);
+ headroom += sizeof(struct ipaccess_head);
nmsg = msgb_alloc_headroom(ABIS_ALLOC_SIZE + headroom,
headroom, "Abis/IP");
@@ -77,10 +77,10 @@ struct msgb *abis_msgb_alloc(int headroom)
void abis_push_ipa(struct msgb *msg, uint8_t proto)
{
- struct ipabis_head *nhh;
+ struct ipaccess_head *nhh;
msg->l2h = msg->data;
- nhh = (struct ipabis_head *) msgb_push(msg, sizeof(*nhh));
+ nhh = (struct ipaccess_head *) msgb_push(msg, sizeof(*nhh));
nhh->proto = proto;
nhh->len = htons(msgb_l2len(msg));
}
@@ -236,7 +236,7 @@ rsl_tx_chan_rqd(link->bts->trx[0]);
/* receive message from BSC */
static int abis_rx(struct ipabis_link *link, struct msgb *msg)
{
- struct ipabis_head *hh = (struct ipabis_head *) msg->data;
+ struct ipaccess_head *hh = (struct ipaccess_head *) msg->data;
int ret = 0;
switch (hh->proto) {
@@ -312,7 +312,7 @@ static void abis_timeout(void *arg)
static int abis_sock_cb(struct osmo_fd *bfd, unsigned int what)
{
struct ipabis_link *link = bfd->data;
- struct ipabis_head *hh;
+ struct ipaccess_head *hh;
struct msgb *msg;
int ret = 0;
@@ -337,7 +337,7 @@ static int abis_sock_cb(struct osmo_fd *bfd, unsigned int what)
return -ENOMEM;
}
msg = link->rx_msg;
- hh = (struct ipabis_head *) msg->data;
+ hh = (struct ipaccess_head *) msg->data;
if (msg->len < sizeof(*hh)) {
ret = recv(link->bfd.fd, msg->data, sizeof(*hh), 0);
if (ret <= 0) {