ports/91284: patch to improve port misc/callid - improves detection of calling / called numbers

[Torfinn Ingolfsen]

>Number:         91284
>Category:       ports
>Synopsis:       patch to improve port misc/callid - improves detection of calling / called numbers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 03 22:10:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Torfinn Ingolfsen
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:


System: FreeBSD 5.4-STABLE #5: Sat Dec 31 16:54:14 CET 2005
    root at kg-work.kg4.no:/usr/obj/usr/src/sys/SS51G

root at kg-web2# portversion -v | grep callid
callid-1.2                  =  up-to-date with port



>Description:


port callid-1.2
The script call-logd was mixing up the calling / called numbers very often. In addition, it was often confused about calls with no calling number (ie. secret number, presentation restricted / not allowed).


>How-To-Repeat:


Install the port misc/callid, and configure it. Try to call yourself (from your cellphone for example) both with and without presentation of number allowed.
Look at the call log (web page).


>Fix:


This small patch seems to fix the problems for me.
It would be wise that somebody else tested it as well, to verify that it doesn't introduce other problems.

--- call-logd_1.2       Tue Jan  3 22:45:53 2006
+++ call-logd_new       Tue Jan  3 22:51:33 2006
@@ -33,13 +33,14 @@
       else{
        @cpn = split(' ', $grepS);
 
-         if ($phonenr eq ''){
-             $phonenr = "$cpn[3]";
-         }#end if phonenr
-
-         else{
-           $msnnr = "$cpn[3]";                             
-         }#end else 
+       if ($cpn[0] eq "[calling") {
+          if ($cpn[3] ne "(type=national,") {
+           $phonenr = "$cpn[3]";
+          }
+       }
+       if ($cpn[0] eq "[called") { 
+          $msnnr = "$cpn[3]";
+       }
 
            
             if ($msnnr eq ''){



>Release-Note:
>Audit-Trail:
>Unformatted: