commit ca3620a70775a1a7f97f2792d7f59982daccc74d
author Harald Welte <laforge@gnumonks.org> Mon May 03 16:30:59 2010 +0200
committer Harald Welte <laforge@gnumonks.org> Tue May 04 07:20:44 2010 +0200
tree 98a2bcc06746ff50bb755356669a24e5ac42b351
parent 5658a1a76618b61c647c243653f16fc379c9d0bd

[gprs] gb_proxy: use new msgb_bssgph() and msgb_bssgp_len() macros

The proxy code still operated on msg->l3h, which is no longer the
BSSGP header now.

openbsc/src/gb_proxy.c

diff --git a/openbsc/src/gb_proxy.c b/openbsc/src/gb_proxy.c
index a9aa754..4d8f27f 100644
--- a/openbsc/src/gb_proxy.c
+++ b/openbsc/src/gb_proxy.c
@@ -151,10 +151,10 @@
 static int gbprox_rx_sig_from_bss(struct msgb *msg, struct gprs_nsvc *nsvc,
 				  uint16_t ns_bvci)
 {
-	struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msg->l3h;
+	struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg);
 	struct tlv_parsed tp;
 	uint8_t pdu_type = bgph->pdu_type;
-	int data_len = msgb_l3len(msg) - sizeof(*bgph);
+	int data_len = msgb_bssgp_len(msg) - sizeof(*bgph);
 	struct gbprox_peer *from_peer;
 	struct gprs_ra_id raid;
 
@@ -227,10 +227,10 @@
 static int gbprox_rx_sig_from_sgsn(struct msgb *msg, struct gprs_nsvc *nsvc,
 				   uint16_t ns_bvci)
 {
-	struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msg->l3h;
+	struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg);
 	struct tlv_parsed tp;
 	uint8_t pdu_type = bgph->pdu_type;
-	int data_len = msgb_l3len(msg) - sizeof(*bgph);
+	int data_len = msgb_bssgp_len(msg) - sizeof(*bgph);
 	struct gbprox_peer *peer;
 	uint16_t bvci;
 	int rc = 0;