msn/ring-mapping

Gert Doering (gert@greenie.muc.de)
Tue, 1 Sep 1998 12:33:06 +0200


Hi,

Joerg Friedrich wrote:
> Mgetty loses the mapping after 2nd ring:
> 
> 09/01 11:28:45 yS1   wfr: rc=0, drn=2		<-------
[..]
> 09/01 11:28:50 yS1   wfr: rc=0, drn=0		<-------

Should be fixed with the following patch.  Please test.

gert
---------------------------
Index: mgetty.c
===================================================================
RCS file: /u2/cvs/mgetty/mgetty.c,v
retrieving revision 4.21
diff -u -r4.21 mgetty.c
--- mgetty.c	1998/08/03 20:02:08	4.21
+++ mgetty.c	1998/09/01 10:26:44
@@ -696,6 +696,8 @@
 		break;
 	    }
 
+	    dist_ring=0;		/* yet unspecified RING type */
+
 	    if ( c_bool(ringback) )	/* don't pick up on first call */
 	    {
 		int n = 0;
Index: ring.c
===================================================================
RCS file: /u2/cvs/mgetty/ring.c,v
retrieving revision 4.7
diff -u -r4.7 ring.c
--- ring.c	1998/08/02 20:50:47	4.7
+++ ring.c	1998/09/01 10:27:06
@@ -143,7 +143,6 @@
 	if ( virtual_ring )
 	{
 	    lputs( L_NOISE, "``found''" );
-	    *dist_ring_number = 0;
 	    break;
 	}
 
@@ -231,13 +230,13 @@
 	while( isspace(*p) ) p++;
 
 	if ( *p == '\0' )			/* "classic RING" */
-	    { *dist_ring_number = 0; break; }
+	    { break; }
 
 	if ( *p == ';' )			/* ELSA type */
 	    { *dist_ring_number = ring_handle_ELSA( p, msn_list ); break; }
 
 	if ( strlen(p) > 1 )			/* USR type B: "RING 1234" */
-	    { CallerId = safedup(p); *dist_ring_number = 0; break; }
+	    { CallerId = safedup(p); break; }
 
 	if ( isdigit( *p ) )			/* RING 1 */
 	    { *dist_ring_number = *p-'0'; break; }

-- 
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             gert@greenie.muc.de
fax: +49-89-35655025                        gert.doering@physik.tu-muenchen.de