[Asterisk-Users] FIXED2 - 487 Request Terminated ?

[Brancaleoni Matteo]

Oops, the previous patch had a little
bug... now it's fixed. please use this one.

Matteo

Il lun, 2003-03-17 alle 18:06, Matteo Brancaleoni ha scritto:
> I've a sip phone that when called,
> if not answered and you hangup
> on the caller side, sends out
> "487 Request Terminated" .
> But seems that * don't get that
> message (I think * ignore it)
> so the phone don't get an OK
> and keep ringing until timeout,
> even if the caller has hanged
> up.
> 
> Could that be added to *?
> Attached some debug.
> 
> Matteo Brancaleoni
> mbrancaleoni at espia.it
> Emmegi System Administrator
>  
> EspiA - EMMEGI Srl - e*solution provider
> Uffici: Via Pascoli, 37
> 20129 Milano - Italy
> Sede Legale: Corso Sempione 67
> 20149 Milano - Italy
> Tel. +39 0270633354
> Fax. +39 0245487890
> http://www.espia.it
-------------- next part --------------
--- ./asterisk/channels/chan_sip.c	2003-03-18 01:35:29.000000000 +0100
+++ ./myasterisk/channels/chan_sip.c	2003-03-18 15:47:43.000000000 +0100
@@ -183,6 +183,8 @@
 	int initid;							/* Auto-congest ID if appropriate */
 
         int dtmfmode;
+	time_t hanguptimer;				/* hangup timer */
+	int needhanguptimer;				/* hangup timer started or not*/
         struct ast_dsp *vad;
 	
 	struct sip_peer *peerpoke;			/* If this calls is to poke a peer, which one */
@@ -3260,6 +3262,7 @@
 					break;
 				}
 				transmit_request(p, "ACK", 0);
+				ast_log(LOG_DEBUG, "ooh, SIP DESTROY 4xx user=%s\n",p->username);
 				__sip_destroy(p, 0);
 				p = NULL;
 			} else
@@ -3711,6 +3714,7 @@
 	struct sip_pvt *sip;
 	struct sip_peer *peer;
 	time_t t;
+	time_t hanguptimer,temptime;
 	/* Add an I/O event to our UDP socket */
 	if (sipsock > -1) 
 		ast_io_add(io, sipsock, sipsock_read, AST_IO_IN, NULL);
@@ -3724,7 +3728,31 @@
 restartsearch:		
 		sip = iflist;
 		while(sip) {
-			if (sip->needdestroy) {
+			/* Ok, start wait before destroying a channel */
+			/* in order to get late responses and ack them */
+			if ((sip->needdestroy) && !(sip->needhanguptimer)) 
+			{
+				ast_log(LOG_DEBUG, "Starting timer check\n");
+				sip->needhanguptimer = 1;
+				time(&hanguptimer);
+				sip->hanguptimer = hanguptimer;
+				goto restartsearch;
+			}
+			/* Ok, already started the timer, check it */
+			else if ((sip->needdestroy) && (sip->needhanguptimer)) 
+			{
+				time(&temptime);
+				/* 10 secs for late packets */
+				if((temptime - sip->hanguptimer) > 10)
+				{
+					ast_log(LOG_DEBUG, "Time Expired!\n");
+					sip->needhanguptimer = 2;
+				}
+			}
+			/* If we are here, the timer is started */
+			/* check if it's set as expired , then destroy */
+			if ((sip->needdestroy) && (sip->needhanguptimer == 2)) {
+				ast_log(LOG_DEBUG, "Gotta a SIP Destroy! Username=%s callid=%s \n",sip->username,sip->callid);
 				__sip_destroy(sip, 1);
 				goto restartsearch;
 			}