[svn-commits] rmudgett: mISDNuser/trunk r23 - in /mISDNuser/trunk/i4lnet: net_if.c net_l3.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Oct 14 16:25:24 2008
New Revision: 23

URL: http://svn.digium.com/view/thirdparty?view=rev&rev=23
Log:
Fixes imported from git trunk

Modified:
    mISDNuser/trunk/i4lnet/net_if.c
    mISDNuser/trunk/i4lnet/net_l3.c

Modified: mISDNuser/trunk/i4lnet/net_if.c
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/i4lnet/net_if.c?view=diff&rev=23&r1=22&r2=23
==============================================================================
--- mISDNuser/trunk/i4lnet/net_if.c (original)
+++ mISDNuser/trunk/i4lnet/net_if.c Tue Oct 14 16:25:24 2008
@@ -294,10 +294,7 @@
 		}
 		nst->phd_down_msg = msg;
 	}
-	int ret=mISDN_write(nst->device, msg->data, msg->len, -1);
-	if (ret <0) {
-		dprint(DBGM_NET, nst->cardnr, "******* %s: msg(%p) len(%d) pr(%x) di(%x) q(%d) write returned:%d errno:%s\n", __FUNCTION__, msg, msg->len, hh->prim, hh->dinfo, nst->phd_down_msg?1:0, ret, strerror(errno));
-	}
+	mISDN_write(nst->device, msg->data, msg->len, -1);
 	free_msg(msg);
 	return(0);
 }

Modified: mISDNuser/trunk/i4lnet/net_l3.c
URL: http://svn.digium.com/view/thirdparty/mISDNuser/trunk/i4lnet/net_l3.c?view=diff&rev=23&r1=22&r2=23
==============================================================================
--- mISDNuser/trunk/i4lnet/net_l3.c (original)
+++ mISDNuser/trunk/i4lnet/net_l3.c Tue Oct 14 16:25:24 2008
@@ -2064,7 +2064,9 @@
 	relc->CAUSE[2] = CAUSE_NOUSER_RESPONDING | 0x80;
 	if (mISDN_l3up(pc, msg))
 		free_msg(msg);
-	newl3state(pc, 22);
+//	newl3state(pc, 22);
+	newl3state(pc, 0);
+	send_proc(pc, IMSG_END_PROC_M, NULL);
 }
 
 static void
@@ -2155,7 +2157,7 @@
 			*pc->op++ = IE_CAUSE;
 			*pc->op++ = 2;
 			*pc->op++ = 0x80;
-			*pc->op++ = 0x80 | 0x47;
+			*pc->op++ = 0x80 | 47;
 		}
 		if (hrej->DISPLAY)
 			AddvarIE(pc, IE_DISPLAY, hrej->DISPLAY);
@@ -2163,7 +2165,7 @@
 		*pc->op++ = IE_CAUSE;
 		*pc->op++ = 2;
 		*pc->op++ = 0x80;
-		*pc->op++ = 0x80 | 0x47;
+		*pc->op++ = 0x80 | 47;
 	}
 	SendMsg(pc, -1);
 }
@@ -2204,7 +2206,7 @@
 			*pc->op++ = IE_CAUSE;
 			*pc->op++ = 2;
 			*pc->op++ = 0x80;
-			*pc->op++ = 0x80 | 0x47;
+			*pc->op++ = 0x80 | 47;
 		}
 		if (rrej->DISPLAY)
 			AddvarIE(pc, IE_DISPLAY, rrej->DISPLAY);
@@ -2212,7 +2214,7 @@
 		*pc->op++ = IE_CAUSE;
 		*pc->op++ = 2;
 		*pc->op++ = 0x80;
-		*pc->op++ = 0x80 | 0x47;
+		*pc->op++ = 0x80 | 47;
 	}
 	SendMsg(pc, -1);
 }
@@ -2250,7 +2252,7 @@
 			*pc->op++ = IE_CAUSE;
 			*pc->op++ = 2;
 			*pc->op++ = 0x80;
-			*pc->op++ = 0x80 | 0x47;
+			*pc->op++ = 0x80 | 47;
 		}
 		if (srej->DISPLAY)
 			AddvarIE(pc, IE_DISPLAY, srej->DISPLAY);
@@ -2258,7 +2260,7 @@
 		*pc->op++ = IE_CAUSE;
 		*pc->op++ = 2;
 		*pc->op++ = 0x80;
-		*pc->op++ = 0x80 | 0x47;
+		*pc->op++ = 0x80 | 47;
 	}
 	SendMsg(pc, -1);
 	newl3state(pc, 10);
@@ -2298,7 +2300,7 @@
 			*pc->op++ = IE_CAUSE;
 			*pc->op++ = 2;
 			*pc->op++ = 0x80;
-			*pc->op++ = 0x80 | 0x47;
+			*pc->op++ = 0x80 | 47;
 		}
 		if (rrej->DISPLAY)
 			AddvarIE(pc, IE_DISPLAY, rrej->DISPLAY);
@@ -2306,7 +2308,7 @@
 		*pc->op++ = IE_CAUSE;
 		*pc->op++ = 2;
 		*pc->op++ = 0x80;
-		*pc->op++ = 0x80 | 0x47;
+		*pc->op++ = 0x80 | 47;
 	}
 	SendMsg(pc, -1);
 	newl3state(pc, 0);