[Opalvoip-svn] SF.net SVN: opalvoip:[22766] opal/trunk/src/sip/sipep.cxx

[<rjo...@us...>]

Revision: 22766
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=22766&view=rev
Author:   rjongbloed
Date:     2009-05-29 07:10:38 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Only do ENUM lookup if the whole name is E.164 compatible, don;t try if "123fred" or worse "10.0.1.1" as that clearly is not a phone number.

Modified Paths:
--------------
    opal/trunk/src/sip/sipep.cxx

Modified: opal/trunk/src/sip/sipep.cxx
===================================================================
--- opal/trunk/src/sip/sipep.cxx	2009-05-29 06:35:21 UTC (rev 22765)
+++ opal/trunk/src/sip/sipep.cxx	2009-05-29 07:10:38 UTC (rev 22766)
@@ -320,14 +320,9 @@
   if (remoteParty.Find('@') == P_MAX_INDEX) {
 
     // make sure the number has only digits
-    PString e164 = remoteParty;
-    PINDEX pos = e164.Find(':');
-    if (pos != P_MAX_INDEX)
-      e164.Delete(0, pos+1);
-    pos = e164.FindSpan("0123456789*#", e164[0] != '+' ? 0 : 1);
-    e164.Delete(pos, P_MAX_INDEX);
-
-    if (!e164.IsEmpty()) {
+    PINDEX pos = remoteParty.Find(':');
+    PString e164 = pos != P_MAX_INDEX ? remoteParty.Mid(pos+1) : remoteParty;
+    if (e164.FindSpan("0123456789*#", e164[0] != '+' ? 0 : 1) == P_MAX_INDEX) {
       PString str;
       if (PDNS::ENUMLookup(e164, "E2U+SIP", str)) {
         PTRACE(4, "SIP\tENUM converted remote party " << remoteParty << " to " << str);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.