[Fixed sql query and display of media session in case of ICE
Adrian Georgescu <ag@ag-projects.com>**20100222094215] hunk ./library/cdr_opensips.php 44
-                         'MediaTimeout'    => 'MediaInfo',
+                         'MediaInfo'       => 'MediaInfo',
hunk ./library/cdr_opensips.php 2588
+        } else {
+        	$this->inputTrafficPrint=0;
hunk ./library/cdr_opensips.php 2594
+        } else {
+        	$this->outputTrafficPrint=0;
hunk ./library/cdr_opensips.php 2868
+        $this->cdr_details.= "
+        <table border=0 cellpadding=0 cellspacing=0>
hunk ./library/cdr_opensips.php 2871
-            $this->cdr_details.= "
-            <table border=0 cellpadding=0 cellspacing=0>
+        <tr>
+            <td colspan=3><b>Media Streams</b></td>
+        </tr>
+        ";
hunk ./library/cdr_opensips.php 2876
+        if ($this->CDRS->mediaTrace) {
+            $media_trace_datasource = $this->CDRS->mediaTrace;
+
+            $this->mediaTraceLink="<a href=\"javascript:void(null);\" onClick=\"return window.open('media_trace.phtml?cdr_source=$media_trace_datasource&callid=$callid_enc&fromtag=$fromtag_enc&totag=$totag_enc&proxyIP=$this->SipProxyServer', 'Trace',
+            'toolbar=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=730')\">Click here to see the media information for this call</a> &nbsp;";
+
+            $this->cdr_details.= sprintf("
hunk ./library/cdr_opensips.php 2884
-                <td colspan=3><b>Media Streams</b></td>
+                <td width=10></td>
+                <td colspan=2>%s</td>
hunk ./library/cdr_opensips.php 2887
-            ";
-
-            if ($this->SipCodec && $this->CDRS->mediaTrace) {
-                $media_trace_datasource = $this->CDRS->mediaTrace;
+            ", $this->mediaTraceLink);
hunk ./library/cdr_opensips.php 2889
-                $this->mediaTraceLink="<a href=\"javascript:void(null);\" onClick=\"return window.open('media_trace.phtml?cdr_source=$media_trace_datasource&callid=$callid_enc&fromtag=$fromtag_enc&totag=$totag_enc&proxyIP=$this->SipProxyServer', 'Trace',
-                'toolbar=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=730')\">Click here to see the media information for this call</a> &nbsp;";
+        }
hunk ./library/cdr_opensips.php 2891
-                $this->cdr_details.= sprintf("
-                <tr>
-                    <td width=10></td>
-                    <td colspan=2>%s</td>
-                </tr>
-                ", $this->mediaTraceLink);
+        $this->cdr_details.= "
+        <tr>
+            <td></td>
+            <td>Applications: </td>
+            <td>$this->applicationType_print</td>
+        </tr>
+        ";
hunk ./library/cdr_opensips.php 2899
-            }
+        $this->SipCodec   = quoted_printable_decode($this->SipCodec);
hunk ./library/cdr_opensips.php 2901
+        if ($this->SipCodec) {
hunk ./library/cdr_opensips.php 2905
-                <td>Applications: </td>
-                <td>$this->applicationType_print</td>
+                <td>Codecs: </td>
+                <td>$this->SipCodec</td>
hunk ./library/cdr_opensips.php 2909
+        }
hunk ./library/cdr_opensips.php 2911
-            if ($this->SipCodec) {
-                $this->SipCodec   = quoted_printable_decode($this->SipCodec);
+        $this->cdr_details.= "
+        <tr>
+            <td></td>
+            <td>Caller RTP: </td>
+            <td>$this->inputTrafficPrint KB</td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>Called RTP: </td>
+            <td>$this->outputTrafficPrint KB</td>
+        </tr>
+        ";
hunk ./library/cdr_opensips.php 2924
-                $this->cdr_details.= "
-                <tr>
-                    <td></td>
-                    <td>Codecs: </td>
-                    <td>$this->SipCodec</td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td>Caller RTP: </td>
-                    <td>$this->inputTrafficPrint KB</td>
-                </tr>
-                <tr>
-                    <td></td>
-                    <td>Called RTP: </td>
-                    <td>$this->outputTrafficPrint KB</td>
-                </tr>
-                ";
-    
-                if ($this->MediaTimeout) {
-                    $this->cdr_details.= "
-                    <tr>
-                    <td></td>
-                    <td>Media Info:</td>
-                    <td><font color=red>$this->MediaTimeout</font></td>
-                    </tr>
-                    ";
-                }
-    
-                if ($this->SipUserAgents) {
-                    $this->SipUserAgents   = quoted_printable_decode($this->SipUserAgents);
-    
-                    $callerAgents=explode("+",$this->SipUserAgents);
-                    $callerUA=htmlentities($callerAgents[0]);
-                    $calledUA=htmlentities($callerAgents[1]);
-    
-                    $this->cdr_details.= "
-                    <tr>
-                        <td></td>
-                        <td>Caller SIP UA: </td>
-                        <td>$callerUA</td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>Called SIP UA: </td>
-                        <td>$calledUA</td>
-                    </tr>
-                    ";
-                }
-    
-                if (is_array($this->QoS)) {
-                    foreach (array_keys($this->QoS) as $_key) {
-                        if ($this->QoSParameters[$_key]) {
-                            $_desc=$this->QoSParameters[$_key];
-                        } else {
-                            $_desc=$_key;
-                        }
-                        $this->cdr_details.=
-                        sprintf ("<tr><td></td><td>%s</td><td>%s</td></tr>\n",
-                        $_desc,$this->QoS[$_key]);
-                    }
-                }
+        if ($this->MediaInfo) {
+            $this->cdr_details.= "
+            <tr>
+            <td></td>
+            <td>Media Info:</td>
+            <td><font color=red>$this->MediaInfo</font></td>
+            </tr>
+            ";
+        }
hunk ./library/cdr_opensips.php 2934
-            }
+        if ($this->SipUserAgents) {
+            $this->SipUserAgents   = quoted_printable_decode($this->SipUserAgents);
+
+            $callerAgents=explode("+",$this->SipUserAgents);
+            $callerUA=htmlentities($callerAgents[0]);
+            $calledUA=htmlentities($callerAgents[1]);
+
+            $this->cdr_details.= "
+            <tr>
+                <td></td>
+                <td>Caller SIP UA: </td>
+                <td>$callerUA</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td>Called SIP UA: </td>
+                <td>$calledUA</td>
+            </tr>
+            ";
+        }
hunk ./library/cdr_opensips.php 2957
-
+ 
hunk ./library/cdr_opensips.php 2963
-
+ 
hunk ./library/cdr_opensips.php 2973
-
+ 
hunk ./library/cdr_opensips.php 2975
-            	$this->ratePrint=nl2br($this->rate);
+                $this->ratePrint=nl2br($this->rate);
hunk ./library/cdr_opensips.php 2982
-
+ 
hunk ./library/cdr_opensips.php 2991
-
+ 
hunk ./setup/radius/OpenSIPS/radius_accounting.proc 6
-  when MediaInfo value passed to query is 'ICE success'
+  when MediaInfo value passed to query is 'ICE session'
hunk ./setup/radius/OpenSIPS/radius_accounting.proc 657
-    IF @var_MediaInfo = 'ICE success' THEN
+    IF @var_MediaInfo = 'ICE session' THEN
hunk ./setup/radius/OpenSIPS/radius_accounting.proc 659
-    		MediaInfo = ?,
+		MediaInfo = ?,
+		SipUserAgents = ?,
+		SipCodecs = ?,
+		SipApplicationType = ?,
hunk ./setup/radius/OpenSIPS/radius_accounting.proc 670
+			@v_SipUserAgents = var_SipUserAgents,
+			@v_SipCodecs = var_SipCodecs,
+			@v_SipApplicationType = var_SipApplicationType,
hunk ./setup/radius/OpenSIPS/radius_accounting.proc 677
-			EXECUTE update_rad USING @v_MediaInfo, @v_AcctSessionId, @v_SipToTag, @v_SipFromTag;
+			EXECUTE update_rad USING @v_MediaInfo, @v_SipUserAgents, @v_SipCodecs, @v_SipApplicationType, @v_AcctSessionId, @v_SipToTag, @v_SipFromTag;