X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=ie.cpp;h=1e18b7741b676cb67731e8691cb89ff887522a5a;hp=5e3074a362fc5c0e10380828af7aa95e725310c0;hb=a425aedc1ee2c0bba4ba20904943afb21bd6e2e5;hpb=5ad4c41dc406a15beaa0a7b73d9dada1df74f939

diff --git a/ie.cpp b/ie.cpp
index 5e3074a..1e18b77 100644
--- a/ie.cpp
+++ b/ie.cpp
@@ -26,10 +26,8 @@ static void strnncpy(unsigned char *dest, unsigned char *src, int len, int dst_l
 
 
 /* IE_COMPLETE */
-void Pdss1::enc_ie_complete(unsigned char **ntmode, msg_t *msg, int complete)
+void Pdss1::enc_ie_complete(struct l3_msg *l3m, int complete)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
 
 	if (complete<0 || complete>1)
 	{
@@ -40,24 +38,15 @@ void Pdss1::enc_ie_complete(unsigned char **ntmode, msg_t *msg, int complete)
 	if (complete)
 	{
 		add_trace("complete", NULL, NULL);
-		p = msg_put(msg, 1);
-		if (p_m_d_ntmode)
-		{
-			*ntmode = p;
-		} else
-			qi->sending_complete.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
-		p[0] = IE_COMPLETE;
+		l3m->sending_complete++;
 	}
 }
 
-void Pdss1::dec_ie_complete(unsigned char *p, Q931_info_t *qi, int *complete)
+void Pdss1::dec_ie_complete(struct l3_msg *l3m, int *complete)
 {
 	*complete = 0;
-	if (!p_m_d_ntmode)
-	{
-		if (qi->sending_complete.off)
-			*complete = 1;
-	} else
+	// special case: p is not a pointer, it's a value
+	unsigned char p = l3m->sending_complete;
 	if (p)
 		*complete = 1;
 
@@ -67,10 +56,9 @@ void Pdss1::dec_ie_complete(unsigned char *p, Q931_info_t *qi, int *complete)
 
 
 /* IE_BEARER */
-void Pdss1::enc_ie_bearer(unsigned char **ntmode, msg_t *msg, int coding, int capability, int mode, int rate, int multi, int user)
+void Pdss1::enc_ie_bearer(struct l3_msg *l3m, int coding, int capability, int mode, int rate, int multi, int user)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (coding<0 || coding>3)
@@ -117,11 +105,6 @@ void Pdss1::enc_ie_bearer(unsigned char **ntmode, msg_t *msg, int coding, int ca
 	add_trace("bearer", "user", "%d", user);
 
 	l = 2 + (multi>=0) + (user>=0);
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->bearer_capability.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_BEARER;
 	p[1] = l;
 	p[2] = 0x80 + (coding<<5) + capability;
@@ -130,9 +113,10 @@ void Pdss1::enc_ie_bearer(unsigned char **ntmode, msg_t *msg, int coding, int ca
 		p[4] = 0x80 + multi;
 	if (user >= 0)
 		p[4+(multi>=0)] = 0xa0 + user;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *capability, int *mode, int *rate, int *multi, int *user)
+void Pdss1::dec_ie_bearer(struct l3_msg *l3m, int *coding, int *capability, int *mode, int *rate, int *multi, int *user)
 {
 	*coding = -1;
 	*capability = -1;
@@ -141,17 +125,12 @@ void Pdss1::dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *c
 	*multi = -1;
 	*user = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->bearer_capability.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->bearer_capability.off + 1;
-	}
+	unsigned char *p = l3m->bearer_capability;
 	if (!p)
 		return;
 	if (p[0] < 2)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("bearer", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -183,10 +162,9 @@ void Pdss1::dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *c
 
 
 /* IE_HLC */
-void Pdss1::enc_ie_hlc(unsigned char **ntmode, msg_t *msg, int coding, int interpretation, int presentation, int hlc, int exthlc)
+void Pdss1::enc_ie_hlc(struct l3_msg *l3m, int coding, int interpretation, int presentation, int hlc, int exthlc)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (coding<0 || coding>3)
@@ -223,11 +201,6 @@ void Pdss1::enc_ie_hlc(unsigned char **ntmode, msg_t *msg, int coding, int inter
 		add_trace("hlc", "exthlc", "%d", exthlc);
 
 	l = 2 + (exthlc>=0);
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->hlc.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_HLC;
 	p[1] = l;
 	p[2] = 0x80 + (coding<<5) + (interpretation<<2) + presentation;
@@ -237,9 +210,10 @@ void Pdss1::enc_ie_hlc(unsigned char **ntmode, msg_t *msg, int coding, int inter
 		p[4] = 0x80 + exthlc;
 	} else
 		p[3] = 0x80 + hlc;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_hlc(unsigned char *p, Q931_info_t *qi, int *coding, int *interpretation, int *presentation, int *hlc, int *exthlc)
+void Pdss1::dec_ie_hlc(struct l3_msg *l3m, int *coding, int *interpretation, int *presentation, int *hlc, int *exthlc)
 {
 	*coding = -1;
 	*interpretation = -1;
@@ -247,17 +221,12 @@ void Pdss1::dec_ie_hlc(unsigned char *p, Q931_info_t *qi, int *coding, int *inte
 	*hlc = -1;
 	*exthlc = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->hlc.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->hlc.off + 1;
-	}
+	unsigned char *p = l3m->hlc;
 	if (!p)
 		return;
 	if (p[0] < 2)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("hlc", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -280,10 +249,9 @@ void Pdss1::dec_ie_hlc(unsigned char *p, Q931_info_t *qi, int *coding, int *inte
 
 
 /* IE_CALL_ID */
-void Pdss1::enc_ie_call_id(unsigned char **ntmode, msg_t *msg, unsigned char *callid, int callid_len)
+void Pdss1::enc_ie_call_id(struct l3_msg *l3m, unsigned char *callid, int callid_len)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	char buffer[25];
@@ -309,34 +277,25 @@ void Pdss1::enc_ie_call_id(unsigned char **ntmode, msg_t *msg, unsigned char *ca
 	add_trace("callid", NULL, "%s", buffer[0]?buffer+1:"<none>");
 
 	l = callid_len;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->call_id.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_CALL_ID;
 	p[1] = l;
 	memcpy(p+2, callid, callid_len);
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_call_id(unsigned char *p, Q931_info_t *qi, unsigned char *callid, int *callid_len)
+void Pdss1::dec_ie_call_id(struct l3_msg *l3m, unsigned char *callid, int *callid_len)
 {
 	char buffer[25];
 	int i;
 
 	*callid_len = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->call_id.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->call_id.off + 1;
-	}
+	unsigned char *p = l3m->call_id;
 	if (!p)
 		return;
 	if (p[0] > 8)
 	{
-		PERROR("IE too long (%d).\n", p[0]);
+		add_trace("callid", "error", "IE too long (len=%d)", p[0]);
 		return;
 	}
 
@@ -355,10 +314,9 @@ void Pdss1::dec_ie_call_id(unsigned char *p, Q931_info_t *qi, unsigned char *cal
 
 
 /* IE_CALLED_PN */
-void Pdss1::enc_ie_called_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, unsigned char *number)
+void Pdss1::enc_ie_called_pn(struct l3_msg *l3m, int type, int plan, unsigned char *number, int number_len)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (type<0 || type>7)
@@ -379,37 +337,30 @@ void Pdss1::enc_ie_called_pn(unsigned char **ntmode, msg_t *msg, int type, int p
 
 	add_trace("called_pn", "type", "%d", type);
 	add_trace("called_pn", "plan", "%d", plan);
-	add_trace("called_pn", "number", "%s", number);
+	UNCPY((char *)p, (char *)number, number_len);
+	p[number_len] = '\0';
+	add_trace("called_pn", "number", "%s", p);
 
-	l = 1+strlen((char *)number);
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->called_nr.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
+	l = 1+number_len;
 	p[0] = IE_CALLED_PN;
 	p[1] = l;
 	p[2] = 0x80 + (type<<4) + plan;
-	UNCPY((char *)p+3, (char *)number, strlen((char *)number));
+	UNCPY((char *)p+3, (char *)number, number_len);
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_called_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, unsigned char *number, int number_len)
+void Pdss1::dec_ie_called_pn(struct l3_msg *l3m, int *type, int *plan, unsigned char *number, int number_len)
 {
 	*type = -1;
 	*plan = -1;
 	*number = '\0';
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->called_nr.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->called_nr.off + 1;
-	}
+	unsigned char *p = l3m->called_nr;
 	if (!p)
 		return;
 	if (p[0] < 2)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("called_pn", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -424,10 +375,9 @@ void Pdss1::dec_ie_called_pn(unsigned char *p, Q931_info_t *qi, int *type, int *
 
 
 /* IE_CALLING_PN */
-void Pdss1::enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, unsigned char *number)
+void Pdss1::enc_ie_calling_pn(struct l3_msg *l3m, int type, int plan, int present, int screen, unsigned char *number, int type2, int plan2, int present2, int screen2, unsigned char *number2)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (type<0 || type>7)
@@ -462,11 +412,6 @@ void Pdss1::enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int
 		l += strlen((char *)number);
 	if (present >= 0)
 		l += 1;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->calling_nr.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_CALLING_PN;
 	p[1] = l;
 	if (present >= 0)
@@ -481,27 +426,82 @@ void Pdss1::enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int
 		if (number) if (number[0])
 			UNCPY((char *)p+3, (char *)number, strlen((char *)number));
 	}
+	add_layer3_ie(l3m, p[0], p[1], p+2);
+
+	/* second calling party number */
+	if (type2 < 0)
+		return;
+	
+	if (type2>7)
+	{
+		PERROR("type2(%d) is out of range.\n", type2);
+		return;
+	}
+	if (plan2<0 || plan2>15)
+	{
+		PERROR("plan2(%d) is out of range.\n", plan2);
+		return;
+	}
+	if (present2>3)
+	{
+		PERROR("present2(%d) is out of range.\n", present2);
+		return;
+	}
+	if (present2 >= 0) if (screen2<0 || screen2>3)
+	{
+		PERROR("screen2(%d) is out of range.\n", screen2);
+		return;
+	}
+
+	add_trace("call_pn 2", "type", "%d", type2);
+	add_trace("call_pn 2", "plan", "%d", plan2);
+	add_trace("call_pn 2", "present", "%d", present2);
+	add_trace("call_pn 2", "screen", "%d", screen2);
+	add_trace("call_pn 2", "number", "%s", number2);
+
+	l = 1;
+	if (number2) if (number2[0])
+		l += strlen((char *)number2);
+	if (present2 >= 0)
+		l += 1;
+	p[0] = IE_CALLING_PN;
+	p[1] = l;
+	if (present2 >= 0)
+	{
+		p[2] = 0x00 + (type2<<4) + plan2;
+		p[3] = 0x80 + (present2<<5) + screen2;
+		if (number2) if (number2[0])
+			UNCPY((char *)p+4, (char *)number2, strlen((char *)number2));
+	} else
+	{
+		p[2] = 0x80 + (type2<<4) + plan2;
+		if (number2) if (number2[0])
+			UNCPY((char *)p+3, (char *)number2, strlen((char *)number2));
+	}
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len)
+void Pdss1::dec_ie_calling_pn(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len, int *type2, int *plan2, int *present2, int *screen2, unsigned char *number2, int number_len2)
 {
 	*type = -1;
 	*plan = -1;
 	*present = -1;
 	*screen = -1;
 	*number = '\0';
-
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->calling_nr.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->calling_nr.off + 1;
-	}
+	*type2 = -1;
+	*plan2 = -1;
+	*present2 = -1;
+	*screen2 = -1;
+	*number2 = '\0';
+	unsigned int numextra = sizeof(l3m->extra) / sizeof(struct m_extie);
+	unsigned int i;
+
+	unsigned char *p = l3m->calling_nr;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("calling_pn", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -511,7 +511,7 @@ void Pdss1::dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int
 	{
 		if (p[0] < 2)
 		{
-			PERROR("IE too short (%d).\n", p[0]);
+			add_trace("calling_pn", "error", "IE too short (len=%d)", p[0]);
 			return;
 		}
 		*present = (p[2]&0x60) >> 5;
@@ -527,14 +527,58 @@ void Pdss1::dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int
 	add_trace("calling_pn", "present", "%d", *present);
 	add_trace("calling_pn", "screen", "%d", *screen);
 	add_trace("calling_pn", "number", "%s", number);
+
+	/* second calling party number */
+	p = NULL;
+	i = 0;
+	while(i < numextra)
+	{
+		if (!l3m->extra[i].val)
+			break;
+		if (l3m->extra[i].ie == IE_CALLING_PN)
+		{
+			p = l3m->extra[i].val;
+			break;
+		}
+		i++;
+	}
+	if (!p)
+		return;
+	if (p[0] < 1)
+	{
+		add_trace("calling_pn2", "error", "IE too short (len=%d)", p[0]);
+		return;
+	}
+
+	*type2 = (p[1]&0x70) >> 4;
+	*plan2 = p[1] & 0xf;
+	if (!(p[1] & 0x80))
+	{
+		if (p[0] < 2)
+		{
+			add_trace("calling_pn2", "error", "IE too short (len=%d)", p[0]);
+			return;
+		}
+		*present2 = (p[2]&0x60) >> 5;
+		*screen2 = p[2] & 0x3;
+		strnncpy(number2, p+3, p[0]-2, number_len2);
+	} else
+	{
+		strnncpy(number2, p+2, p[0]-1, number_len2);
+	}
+
+	add_trace("call_pn 2", "type", "%d", *type2);
+	add_trace("call_pn 2", "plan", "%d", *plan2);
+	add_trace("call_pn 2", "present", "%d", *present2);
+	add_trace("call_pn 2", "screen", "%d", *screen2);
+	add_trace("call_pn 2", "number", "%s", number2);
 }
 
 
 /* IE_CONNECTED_PN */
-void Pdss1::enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, unsigned char *number)
+void Pdss1::enc_ie_connected_pn(struct l3_msg *l3m, int type, int plan, int present, int screen, unsigned char *number)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (type<0 || type>7)
@@ -569,11 +613,6 @@ void Pdss1::enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, in
 		l += strlen((char *)number);
 	if (present >= 0)
 		l += 1;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->connected_nr.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_CONNECT_PN;
 	p[1] = l;
 	if (present >= 0)
@@ -588,9 +627,10 @@ void Pdss1::enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, in
 		if (number) if (number[0])
 			UNCPY((char *)p+3, (char *)number, strlen((char *)number));
 	}
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len)
+void Pdss1::dec_ie_connected_pn(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len)
 {
 	*type = -1;
 	*plan = -1;
@@ -598,17 +638,12 @@ void Pdss1::dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, in
 	*screen = -1;
 	*number = '\0';
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->connected_nr.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->connected_nr.off + 1;
-	}
+	unsigned char *p = l3m->connected_nr;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("connect_pn", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -618,7 +653,7 @@ void Pdss1::dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, in
 	{
 		if (p[0] < 2)
 		{
-			PERROR("IE too short (%d).\n", p[0]);
+			add_trace("connect_pn", "error", "IE too short (len=%d)", p[0]);
 			return;
 		}
 		*present = (p[2]&0x60) >> 5;
@@ -638,10 +673,9 @@ void Pdss1::dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, in
 
 
 /* IE_CAUSE */
-void Pdss1::enc_ie_cause(unsigned char **ntmode, msg_t *msg, int location, int cause)
+void Pdss1::enc_ie_cause(struct l3_msg *l3m, int location, int cause)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (location<0 || location>7)
@@ -659,47 +693,34 @@ void Pdss1::enc_ie_cause(unsigned char **ntmode, msg_t *msg, int location, int c
 	add_trace("cause", "value", "%d", cause);
 
 	l = 2;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->cause.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_CAUSE;
 	p[1] = l;
 	p[2] = 0x80 + location;
 	p[3] = 0x80 + cause;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
-void enc_ie_cause_standalone(unsigned char **ntmode, msg_t *msg, int location, int cause)
+void enc_ie_cause_standalone(struct l3_msg *l3m, int location, int cause)
 {
-	unsigned char *p = msg_put(msg, 4);
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
-	if (ntmode)
-		*ntmode = p+1;
-	else
-		qi->cause.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
+	unsigned char p[256];
 	p[0] = IE_CAUSE;
 	p[1] = 2;
 	p[2] = 0x80 + location;
 	p[3] = 0x80 + cause;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
 
-void Pdss1::dec_ie_cause(unsigned char *p, Q931_info_t *qi, int *location, int *cause)
+void Pdss1::dec_ie_cause(struct l3_msg *l3m, int *location, int *cause)
 {
 	*location = -1;
 	*cause = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->cause.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->cause.off + 1;
-	}
+	unsigned char *p = l3m->cause;
 	if (!p)
 		return;
 	if (p[0] < 2)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("cause", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -712,10 +733,9 @@ void Pdss1::dec_ie_cause(unsigned char *p, Q931_info_t *qi, int *location, int *
 
 
 /* IE_CHANNEL_ID */
-void Pdss1::enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive, int channel)
+void Pdss1::enc_ie_channel_id(struct l3_msg *l3m, int exclusive, int channel)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 	int pri = p_m_mISDNport->pri;
 
@@ -750,11 +770,6 @@ void Pdss1::enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive,
 	{
 		/* BRI */
 		l = 1;
-		p = msg_put(msg, l+2);
-		if (p_m_d_ntmode)
-			*ntmode = p+1;
-		else
-			qi->channel_id.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 		p[0] = IE_CHANNEL_ID;
 		p[1] = l;
 		if (channel == CHANNEL_NO)
@@ -762,6 +777,7 @@ void Pdss1::enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive,
 		else if (channel == CHANNEL_ANY)
 			channel = 3;
 		p[2] = 0x80 + (exclusive<<3) + channel;
+		add_layer3_ie(l3m, p[0], p[1], p+2);
 	} else
 	{
 		/* PRI */
@@ -770,59 +786,46 @@ void Pdss1::enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive,
 		if (channel == CHANNEL_ANY) /* any channel */
 		{
 			l = 1;
-			p = msg_put(msg, l+2);
-			if (p_m_d_ntmode)
-				*ntmode = p+1;
-			else
-				qi->channel_id.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 			p[0] = IE_CHANNEL_ID;
 			p[1] = l;
 			p[2] = 0x80 + 0x20 + 0x03;
+			add_layer3_ie(l3m, p[0], p[1], p+2);
 			return; /* end */
 		}
 		l = 3;
-		p = msg_put(msg, l+2);
-		if (p_m_d_ntmode)
-			*ntmode = p+1;
-		else
-			qi->channel_id.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 		p[0] = IE_CHANNEL_ID;
 		p[1] = l;
 		p[2] = 0x80 + 0x20 + (exclusive<<3) + 0x01;
 		p[3] = 0x80 + 3; /* CCITT, Number, B-type */
 		p[4] = 0x80 + channel;
+		add_layer3_ie(l3m, p[0], p[1], p+2);
 	}
 }
 
-void Pdss1::dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive, int *channel)
+void Pdss1::dec_ie_channel_id(struct l3_msg *l3m, int *exclusive, int *channel)
 {
 	int pri = p_m_mISDNport->pri;
 
 	*exclusive = -1;
 	*channel = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->channel_id.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->channel_id.off + 1;
-	}
+	unsigned char *p = l3m->channel_id;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("channel_id", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
 	if (p[1] & 0x40)
 	{
-		PERROR("refering to channels of other interfaces is not supported.\n");
+		add_trace("channel_id", "error", "refering to channels of other interfaces is not supported");
 		return;
 	}
 	if (p[1] & 0x04)
 	{
-		PERROR("using d-channel is not supported.\n");
+		add_trace("channel_id", "error", "using d-channel is not supported");
 		return;
 	}
 
@@ -832,7 +835,7 @@ void Pdss1::dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive,
 		/* BRI */
 		if (p[1] & 0x20)
 		{
-			PERROR("extended channel ID with non PRI interface.\n");
+			add_trace("channel_id", "error", "extended channel ID with non PRI interface");
 			return;
 		}
 		*channel = p[1] & 0x03;
@@ -845,12 +848,13 @@ void Pdss1::dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive,
 		/* PRI */
 		if (p[0] < 1)
 		{
-			PERROR("IE too short for PRI (%d).\n", p[0]);
+
+			add_trace("channel_id", "error", "IE too short for PRI (len=%d)", p[0]);
 			return;
 		}
 		if (!(p[1] & 0x20))
 		{
-			PERROR("basic channel ID with PRI interface.\n");
+			add_trace("channel_id", "error", "basic channel ID with PRI interface");
 			return;
 		}
 		if ((p[1]&0x03) == 0x00)
@@ -867,18 +871,18 @@ void Pdss1::dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive,
 		}
 		if (p[0] < 3)
 		{
-			PERROR("%s: ERROR: IE too short for PRI with channel(%d).\n", __FUNCTION__, p[0]);
+			add_trace("channel_id", "error", "IE too short for PRI with channel (len=%d)", p[0]);
 			return;
 		}
 		if (p[2] & 0x10)
 		{
-			PERROR("channel map not supported.\n");
+			add_trace("channel_id", "error", "channel map not supported");
 			return;
 		}
 		*channel = p[3] & 0x7f;
-		if (*channel<1 | *channel==16)
+		if ((*channel<1) || (*channel==16))
 		{
-			PERROR("PRI interface channel out of range (%d).\n", *channel);
+			add_trace("channel_id", "error", "PRI interface channel out of range (%d)", *channel);
 			return;
 		}
 	}
@@ -899,10 +903,9 @@ void Pdss1::dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive,
 
 
 /* IE_DATE */
-void Pdss1::enc_ie_date(unsigned char **ntmode, msg_t *msg, time_t ti, int no_seconds)
+void Pdss1::enc_ie_date(struct l3_msg *l3m, time_t ti, int no_seconds)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	struct tm *tm;
@@ -918,11 +921,6 @@ void Pdss1::enc_ie_date(unsigned char **ntmode, msg_t *msg, time_t ti, int no_se
 	add_trace("date", "time", "%d:%d:%d", tm->tm_hour, tm->tm_min, tm->tm_sec);
 
 	l = 5 + (!no_seconds);
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->date.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_DATE;
 	p[1] = l;
 	p[2] = tm->tm_year % 100;
@@ -932,14 +930,14 @@ void Pdss1::enc_ie_date(unsigned char **ntmode, msg_t *msg, time_t ti, int no_se
 	p[6] = tm->tm_min;
 	if (!no_seconds)
 		p[7] = tm->tm_sec;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
 
 /* IE_DISPLAY */
-void Pdss1::enc_ie_display(unsigned char **ntmode, msg_t *msg, unsigned char *display)
+void Pdss1::enc_ie_display(struct l3_msg *l3m, unsigned char *display)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (!display[0])
@@ -957,31 +955,22 @@ void Pdss1::enc_ie_display(unsigned char **ntmode, msg_t *msg, unsigned char *di
 	add_trace("display", NULL, "%s", display);
 
 	l = strlen((char *)display);
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->display.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_DISPLAY;
 	p[1] = l;
 	UNCPY((char *)p+2, (char *)display, strlen((char *)display));
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_display(unsigned char *p, Q931_info_t *qi, unsigned char *display, int display_len)
+void Pdss1::dec_ie_display(struct l3_msg *l3m, unsigned char *display, int display_len)
 {
 	*display = '\0';
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->display.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->display.off + 1;
-	}
+	unsigned char *p = l3m->display;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("display", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -992,10 +981,9 @@ void Pdss1::dec_ie_display(unsigned char *p, Q931_info_t *qi, unsigned char *dis
 
 
 /* IE_KEYPAD */
-void Pdss1::enc_ie_keypad(unsigned char **ntmode, msg_t *msg, unsigned char *keypad)
+void Pdss1::enc_ie_keypad(struct l3_msg *l3m, unsigned char *keypad)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (!keypad[0])
@@ -1007,31 +995,22 @@ void Pdss1::enc_ie_keypad(unsigned char **ntmode, msg_t *msg, unsigned char *key
 	add_trace("keypad", NULL, "%s", keypad);
 
 	l = strlen((char *)keypad);
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->keypad.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_KEYPAD;
 	p[1] = l;
 	UNCPY((char *)p+2, (char *)keypad, strlen((char *)keypad));
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_keypad(unsigned char *p, Q931_info_t *qi, unsigned char *keypad, int keypad_len)
+void Pdss1::dec_ie_keypad(struct l3_msg *l3m, unsigned char *keypad, int keypad_len)
 {
 	*keypad = '\0';
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->keypad.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->keypad.off + 1;
-	}
+	unsigned char *p = l3m->keypad;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("keypad", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -1042,10 +1021,9 @@ void Pdss1::dec_ie_keypad(unsigned char *p, Q931_info_t *qi, unsigned char *keyp
 
 
 /* IE_NOTIFY */
-void Pdss1::enc_ie_notify(unsigned char **ntmode, msg_t *msg, int notify)
+void Pdss1::enc_ie_notify(struct l3_msg *l3m, int notify)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (notify<0 || notify>0x7f)
@@ -1057,31 +1035,22 @@ void Pdss1::enc_ie_notify(unsigned char **ntmode, msg_t *msg, int notify)
 	add_trace("notify", NULL, "%d", notify);
 
 	l = 1;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->notify.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_NOTIFY;
 	p[1] = l;
 	p[2] = 0x80 + notify;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_notify(unsigned char *p, Q931_info_t *qi, int *notify)
+void Pdss1::dec_ie_notify(struct l3_msg *l3m, int *notify)
 {
 	*notify = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->notify.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->notify.off + 1;
-	}
+	unsigned char *p = l3m->notify;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("notify", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -1092,10 +1061,9 @@ void Pdss1::dec_ie_notify(unsigned char *p, Q931_info_t *qi, int *notify)
 
 
 /* IE_PROGRESS */
-void Pdss1::enc_ie_progress(unsigned char **ntmode, msg_t *msg, int coding, int location, int progress)
+void Pdss1::enc_ie_progress(struct l3_msg *l3m, int coding, int location, int progress)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (coding<0 || coding>0x03)
@@ -1119,34 +1087,25 @@ void Pdss1::enc_ie_progress(unsigned char **ntmode, msg_t *msg, int coding, int
 	add_trace("progress", "indicator", "%d", progress);
 
 	l = 2;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->progress.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_PROGRESS;
 	p[1] = l;
 	p[2] = 0x80 + (coding<<5) + location;
 	p[3] = 0x80 + progress;
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_progress(unsigned char *p, Q931_info_t *qi, int *coding, int *location, int *progress)
+void Pdss1::dec_ie_progress(struct l3_msg *l3m, int *coding, int *location, int *progress)
 {
 	*coding = -1;
 	*location = -1;
 	*progress = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->progress.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->progress.off + 1;
-	}
+	unsigned char *p = l3m->progress;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("progress", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -1161,10 +1120,9 @@ void Pdss1::dec_ie_progress(unsigned char *p, Q931_info_t *qi, int *coding, int
 
 
 /* IE_REDIR_NR (redirecting = during MT_SETUP) */
-void Pdss1::enc_ie_redir_nr(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, int reason, unsigned char *number)
+void Pdss1::enc_ie_redir_nr(struct l3_msg *l3m, int type, int plan, int present, int screen, int reason, unsigned char *number)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (type<0 || type>7)
@@ -1209,11 +1167,6 @@ void Pdss1::enc_ie_redir_nr(unsigned char **ntmode, msg_t *msg, int type, int pl
 		if (reason >= 0)
 			l += 1;
 	}
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->redirect_nr.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_REDIR_NR;
 	p[1] = l;
 	if (present >= 0)
@@ -1238,9 +1191,10 @@ void Pdss1::enc_ie_redir_nr(unsigned char **ntmode, msg_t *msg, int type, int pl
 		if (number) if (number[0])
 			UNCPY((char *)p+3, (char *)number, strlen((char *)number));
 	}
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_redir_nr(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, int *reason, unsigned char *number, int number_len)
+void Pdss1::dec_ie_redir_nr(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, int *reason, unsigned char *number, int number_len)
 {
 	*type = -1;
 	*plan = -1;
@@ -1249,17 +1203,12 @@ void Pdss1::dec_ie_redir_nr(unsigned char *p, Q931_info_t *qi, int *type, int *p
 	*reason = -1;
 	*number = '\0';
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->redirect_nr.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->redirect_nr.off + 1;
-	}
+	unsigned char *p = l3m->redirect_nr;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("redir'ing", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -1292,10 +1241,9 @@ void Pdss1::dec_ie_redir_nr(unsigned char *p, Q931_info_t *qi, int *type, int *p
 
 
 /* IE_REDIR_DN (redirection = during MT_NOTIFY) */
-void Pdss1::enc_ie_redir_dn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, unsigned char *number)
+void Pdss1::enc_ie_redir_dn(struct l3_msg *l3m, int type, int plan, int present, unsigned char *number)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	if (type<0 || type>7)
@@ -1324,11 +1272,6 @@ void Pdss1::enc_ie_redir_dn(unsigned char **ntmode, msg_t *msg, int type, int pl
 		l += strlen((char *)number);
 	if (present >= 0)
 		l += 1;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->redirect_dn.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_REDIR_DN;
 	p[1] = l;
 	if (present >= 0)
@@ -1343,26 +1286,22 @@ void Pdss1::enc_ie_redir_dn(unsigned char **ntmode, msg_t *msg, int type, int pl
 		if (number)
 			UNCPY((char *)p+3, (char *)number, strlen((char *)number));
 	}
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_redir_dn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, unsigned char *number, int number_len)
+void Pdss1::dec_ie_redir_dn(struct l3_msg *l3m, int *type, int *plan, int *present, unsigned char *number, int number_len)
 {
 	*type = -1;
 	*plan = -1;
 	*present = -1;
 	*number = '\0';
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->redirect_dn.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->redirect_dn.off + 1;
-	}
+	unsigned char *p = l3m->redirect_dn;
 	if (!p)
 		return;
 	if (p[0] < 1)
 	{
-		PERROR("IE too short (%d).\n", p[0]);
+		add_trace("redir'tion", "error", "IE too short (len=%d)", p[0]);
 		return;
 	}
 
@@ -1385,10 +1324,9 @@ void Pdss1::dec_ie_redir_dn(unsigned char *p, Q931_info_t *qi, int *type, int *p
 
 
 /* IE_FACILITY */
-void Pdss1::enc_ie_facility(unsigned char **ntmode, msg_t *msg, unsigned char *facility, int facility_len)
+void Pdss1::enc_ie_facility(struct l3_msg *l3m, unsigned char *facility, int facility_len)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	char buffer[768];
@@ -1409,29 +1347,20 @@ void Pdss1::enc_ie_facility(unsigned char **ntmode, msg_t *msg, unsigned char *f
 	add_trace("facility", NULL, "%s", buffer+1);
 
 	l = facility_len;
-	p = msg_put(msg, l+2);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->facility.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_FACILITY;
 	p[1] = l;
 	memcpy(p+2, facility, facility_len);
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_facility(unsigned char *p, Q931_info_t *qi, unsigned char *facility, int *facility_len)
+void Pdss1::dec_ie_facility(struct l3_msg *l3m, unsigned char *facility, int *facility_len)
 {
 	char debug[768];
 	int i;
 
 	*facility_len = 0;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->facility.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->facility.off + 1;
-	}
+	unsigned char *p = l3m->facility;
 	if (!p)
 		return;
 
@@ -1450,7 +1379,7 @@ void Pdss1::dec_ie_facility(unsigned char *p, Q931_info_t *qi, unsigned char *fa
 }
 
 
-void Pdss1::dec_facility_centrex(unsigned char *p, Q931_info_t *qi, unsigned char *cnip, int cnip_len)
+void Pdss1::dec_facility_centrex(struct l3_msg *l3m, unsigned char *cnip, int cnip_len)
 {
 	unsigned char centrex[256];
 	char debug[768];
@@ -1458,7 +1387,7 @@ void Pdss1::dec_facility_centrex(unsigned char *p, Q931_info_t *qi, unsigned cha
 	int i = 0, j;
 	*cnip = '\0';
 
-	dec_ie_facility(p, qi, centrex, &facility_len);
+	dec_ie_facility(l3m, centrex, &facility_len);
 	if (facility_len >= 2)
 	{
 		if (centrex[i++] != CENTREX_FAC)
@@ -1497,10 +1426,9 @@ void Pdss1::dec_facility_centrex(unsigned char *p, Q931_info_t *qi, unsigned cha
 
 
 /* IE_USERUSER */
-void Pdss1::enc_ie_useruser(unsigned char **ntmode, msg_t *msg, int protocol, unsigned char *user, int user_len)
+void Pdss1::enc_ie_useruser(struct l3_msg *l3m, int protocol, unsigned char *user, int user_len)
 {
-	unsigned char *p;
-	Q931_info_t *qi = (Q931_info_t *)(msg->data + mISDN_HEADER_LEN);
+	unsigned char p[256];
 	int l;
 
 	char buffer[768];
@@ -1527,18 +1455,14 @@ void Pdss1::enc_ie_useruser(unsigned char **ntmode, msg_t *msg, int protocol, un
 	add_trace("useruser", "value", "%s", buffer);
 
 	l = user_len;
-	p = msg_put(msg, l+3);
-	if (p_m_d_ntmode)
-		*ntmode = p+1;
-	else
-		qi->useruser.off = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_USER_USER;
 	p[1] = l;
 	p[2] = 0x80 + protocol;
 	memcpy(p+3, user, user_len);
+	add_layer3_ie(l3m, p[0], p[1], p+2);
 }
 
-void Pdss1::dec_ie_useruser(unsigned char *p, Q931_info_t *qi, int *protocol, unsigned char *user, int *user_len)
+void Pdss1::dec_ie_useruser(struct l3_msg *l3m, int *protocol, unsigned char *user, int *user_len)
 {
 	char buffer[768];
 	int i;
@@ -1546,12 +1470,7 @@ void Pdss1::dec_ie_useruser(unsigned char *p, Q931_info_t *qi, int *protocol, un
 	*user_len = 0;
 	*protocol = -1;
 
-	if (!p_m_d_ntmode)
-	{
-		p = NULL;
-		if (qi->useruser.off)
-			p = (unsigned char *)qi + sizeof(Q931_info_t) + qi->useruser.off + 1;
-	}
+	unsigned char *p = l3m->useruser;
 	if (!p)
 		return;