commit 9dfbf253c69401ebd78066ea53f2187530ad5cea
author Daniel Willmann <daniel@totalueberwachung.de> Mon Dec 29 03:24:29 2008 +0000
committer Daniel Willmann <daniel@totalueberwachung.de> Mon Dec 29 03:24:29 2008 +0000
tree f4e8db6ec540c3a482af7fa1255f10d07b6fcecd
parent de9226de168e941e0955e92c0d0c3db5dfd6cd96

Send transaction index when sending an CP-ACK

src/gsm_04_11.c

diff --git a/src/gsm_04_11.c b/src/gsm_04_11.c
index 8a0530c..a409a59 100644
--- a/src/gsm_04_11.c
+++ b/src/gsm_04_11.c
@@ -117,7 +117,8 @@
 	return 0;
 }
 
-static int gsm411_send_rp_ack(struct gsm_lchan *lchan, u_int8_t msg_ref)
+static int gsm411_send_rp_ack(struct gsm_lchan *lchan, u_int8_t trans_id,
+		u_int8_t msg_ref)
 {
 	struct msgb *msg = gsm411_msgb_alloc();
 	struct gsm48_hdr *gh;
@@ -126,7 +127,7 @@
 	msg->lchan = lchan;
 
 	gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
-	gh->proto_discr = GSM48_PDISC_SMS;
+	gh->proto_discr = GSM48_PDISC_SMS | trans_id<<4;
 	gh->msg_type = GSM411_MT_CP_ACK;
 
 	rp = (struct gsm411_rp_hdr *)msgb_put(msg, sizeof(*rp));
@@ -138,7 +139,8 @@
 	return gsm0411_sendmsg(msg);
 }
 
-static int gsm411_send_rp_error(struct gsm_lchan *lchan, u_int8_t msg_ref)
+static int gsm411_send_rp_error(struct gsm_lchan *lchan, u_int8_t trans_id,
+		u_int8_t msg_ref)
 {
 	struct msgb *msg = gsm411_msgb_alloc();
 	struct gsm48_hdr *gh;
@@ -147,7 +149,7 @@
 	msg->lchan = lchan;
 
 	gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
-	gh->proto_discr = GSM48_PDISC_SMS;
+	gh->proto_discr = GSM48_PDISC_SMS | trans_id<<4;
 	gh->msg_type = GSM411_MT_CP_ERROR;
 
 	rp = (struct gsm411_rp_hdr *)msgb_put(msg, sizeof(*rp));
@@ -173,7 +175,7 @@
 		/* Skip SMSC no and RP-UD length */
 		msg->smsh = &rp_data->data[1] + rp_data->data[1] + 2;
 		gsm411_sms_submit_from_msgb(msg);
-		gsm411_send_rp_ack(msg->lchan, rp_data->msg_ref);
+		gsm411_send_rp_ack(msg->lchan, (gh->proto_discr & 0xf0)>>4, rp_data->msg_ref);
 		break;
 	default:
 		DEBUGP(DSMS, "Unimplemented RP type 0x%02x\n", msg_type);