[Bug 346] New: adds ExtendedRing config option

This patch, submitted by Sascha Herrmann <sascha.herrmann@gmx.de>, allows the
extended RING identifier to be configured.  Apparently Zyxel sends extended
RING information in the format... "RING;1234567890;12345".  The default remains
the same, so existing configurations should encounter no problems.

diff --git a/faxd/ClassModem.c++ b/faxd/ClassModem.c++
index 7dbe943e77400d560dd7e9b79a4511edd5f5f35f..ed1ee82e2375269983674bb2e09a8da1b9c5fa26 100644 (file)
--- a/faxd/ClassModem.c++
+++ b/faxd/ClassModem.c++
@@ -1196,7 +1196,8 @@ ClassModem::waitForRings(u_int n, CallType& type, CallerID& cinfo)
                else if (streq(conf.ringVoice, rbuf))
                    type = CALLTYPE_VOICE;
                else {
-                   if (strneq(rbuf, "RING ", 5))       // extended RING
+                   if (strneq(rbuf, conf.ringExtended,
+                           conf.ringExtended.length()))        // extended RING
                        n--;
                    conf.parseCID(rbuf, cinfo);
                    break;

diff --git a/faxd/ModemConfig.c++ b/faxd/ModemConfig.c++
index 85a09b3471b0df8e78f6e2d3c3b74565cb4400d4..a84da09f96e55143f23a0cfec0394bc883c4a7fa 100644 (file)
--- a/faxd/ModemConfig.c++
+++ b/faxd/ModemConfig.c++
@@ -155,6 +155,7 @@ static struct {
 { "ringdata",                  &ModemConfig::ringData },
 { "ringfax",                   &ModemConfig::ringFax },
 { "ringvoice",                 &ModemConfig::ringVoice },
+{ "ringextended",              &ModemConfig::ringExtended,     "RING " },
 { "cidname",                   &ModemConfig::cidName },
 { "cidnumber",                 &ModemConfig::cidNumber },
 };

diff --git a/faxd/ModemConfig.h b/faxd/ModemConfig.h
index 411303287cc3b900318d184725705bfdf86d2b55..c64700814ee23d7420a7eacb3ba615405a5b02f0 100644 (file)
--- a/faxd/ModemConfig.h
+++ b/faxd/ModemConfig.h
@@ -94,6 +94,7 @@ public:
     fxStr      ringData;               // data call ring string
     fxStr      ringFax;                // fax call ring string
     fxStr      ringVoice;              // voice call ring string
+    fxStr      ringExtended;           // extended ring
                                        // caller id
     fxStr      cidName;                // pattern for name info
     fxStr      cidNumber;              // pattern for number info

diff --git a/man/hylafax-config.4f b/man/hylafax-config.4f
index 84a9fc0a441b56bf003c71041a43ff6a2a88dfc5..d5ab1f15e8da2b5a8f40ee7b64b70870d84435bf 100644 (file)
--- a/man/hylafax-config.4f
+++ b/man/hylafax-config.4f
@@ -172,6 +172,7 @@ QualifyTSI  string  \-      file of \s-1TSI\s+1 patterns for qualifying senders
 RecvDataFormat string  \s-1adaptive\s+1        format for received facsimile data
 RecvFileMode   octal   \s-10600\s+1    protection mode to use for received facsimile files
 RingData       string  \-      distinctive ring data call identifier
+RingExtended   string  \s-1"RING "\s+1 extended ring message identifier
 RingFax        string  \-      distinctive ring fax call identifier
 RingsBeforeAnswer      integer \s-10\s+1       rings to wait before answering phone
 RingVoice      string  \-      distinctive ring voice call identifier
@@ -1006,6 +1007,11 @@ See also
 and
 .BR RingVoice .
 .TP
+.B RingExtended
+An identifier which matches the initial portion of an extended RING 
+message sent by the modem to relay CID and/or DNIS data instead of 
+sending it formatted on separate lines.
+.TP
 .B RingFax
 A modem status string that identifies that an incoming call is
 for facsimile use.