<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15458] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15458">15458</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-11-13 07:26:05 -0600 (Fri, 13 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>added some debug log - foobar: where is my frame->data ?\!</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribledrcmod_pclimod_pclic">freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribledrcmod_pclimod_pclic"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c (15457 => 15458)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-11-12 23:20:43 UTC (rev 15457)
+++ freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-11-13 13:26:05 UTC (rev 15458)
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx">
</span><span class="cx"> uint32_t pcli_header_i = 0;
</span><span class="cx"> pcli_header_i |= (media_direction);
</span><del>- pcli_header_i |= (instance_id << 2); // this seems to work, but:
</del><ins>+ pcli_header_i |= (instance_id << 2);
</ins><span class="cx"> pcli_header_i |= (switch_id << 12);
</span><del>- pcli_header_i |= (ini_id << 16); // how can i shift left 16 on a uint16_t ???! is shifting not done inside the memory space of the ini_id ?? FIND OUT !!
</del><ins>+ pcli_header_i |= (ini_id << 16);
</ins><span class="cx">
</span><span class="cx"> uint32_t pcli_header_i_n = htonl(pcli_header_i);
</span><span class="cx">
</span><span class="lines">@@ -185,25 +185,28 @@
</span><span class="cx"> /* generate an ip header */
</span><span class="cx"> static switch_status_t gen_ip_header(uint8_t *ip_header, uint16_t payload_size_i)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In gen_ip_header - payload_size_i[%i]\n", payload_size_i);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In gen_ip_header - payload_size_i[%u]\n", payload_size_i);
</ins><span class="cx">
</span><del>- memset(ip_header, 0, sizeof(ip_header)); /* zero */
</del><ins>+ memset(ip_header, 0, (size_t)IP_HEADER_LEN); /* zero */
</ins><span class="cx">
</span><span class="cx"> ip_header[0] |= (4 << 4); /* set version 4 */
</span><span class="cx"> ip_header[0] |= 5; /* set header length 5 */
</span><del>- ip_header[9] |= 17; /* set protocol to UDP */
</del><span class="cx">
</span><span class="cx"> uint16_t payload_size_i_n = htons(payload_size_i);
</span><span class="cx"> memcpy(&ip_header[2], &payload_size_i_n, sizeof(payload_size_i_n));
</span><span class="cx">
</span><ins>+ ip_header[9] |= 17; /* set protocol to UDP */
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* generate a udp header */
</span><span class="cx"> static switch_status_t gen_udp_header(uint8_t *udp_header, uint16_t payload_size_i)
</span><span class="cx"> {
</span><del>- memset(udp_header, 0, sizeof(udp_header)); /* zero */
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In gen_udp_header - payload_size_i[%u]\n", payload_size_i);
</ins><span class="cx">
</span><ins>+ memset(udp_header, 0, (size_t)UDP_HEADER_LEN); /* zero */
+
</ins><span class="cx"> uint16_t payload_size_i_n = htons(payload_size_i); /* set payload size */
</span><span class="cx"> memcpy(&udp_header[4], &payload_size_i_n, sizeof(payload_size_i_n));
</span><span class="cx">
</span><span class="lines">@@ -213,8 +216,11 @@
</span><span class="cx"> /* generate an rtp header */
</span><span class="cx"> static switch_status_t gen_rtp_header(uint8_t *rtp_header, switch_payload_t payload_type, uint16_t seq_i, uint32_t timestamp_i, uint32_t ssrc_i)
</span><span class="cx"> {
</span><del>- memset(rtp_header, 0, sizeof(rtp_header)); /* zero */
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "In gen_rtp_header - payload_type[%u] seq_i[%u] timestamp_i[%lu] ssrc_i[%lu]\n",
+ payload_type, seq_i, (unsigned long)timestamp_i, (unsigned long)ssrc_i);
</ins><span class="cx">
</span><ins>+ memset(rtp_header, 0, (size_t)RTP_HEADER_LEN); /* zero */
+
</ins><span class="cx"> rtp_header[0] |= (2 << 6); /* set version 2 */
</span><span class="cx"> rtp_header[1] |= payload_type; /* set payload type */
</span><span class="cx">
</span><span class="lines">@@ -232,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> static void print_frame_stats(switch_frame_t *frame)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "FRAME STATISTICS: seq[%u] ssrc[%lu] datalen[%lu] rate [%lu] samples [%lu]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "FRAME STATISTICS: seq[%u] ssrc[%lu] datalen[%lu] rate[%lu] samples[%lu]\n",
</ins><span class="cx"> (unsigned)frame->seq, (unsigned long)frame->ssrc, (unsigned long)frame->datalen, (unsigned long)frame->rate, (unsigned long)frame->samples);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -259,9 +265,10 @@
</span><span class="cx"> uint8_t rtp_header[RTP_HEADER_LEN];
</span><span class="cx">
</span><span class="cx"> uint8_t packet[PCLI_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + RTP_HEADER_LEN + frame->datalen];
</span><ins>+
</ins><span class="cx"> uint8_t *in_packet_pointer = packet;
</span><span class="cx">
</span><del>- memset(packet, 0, sizeof(packet)); /* zero - this shouldn't be necessary !!! TODO */
</del><ins>+ memset(packet, 0, sizeof(packet)); /* zero - TODO test if this is still necessary - don't think so! */
</ins><span class="cx">
</span><span class="cx"> gen_rtp_header(rtp_header, frame->payload, frame->seq, frame->timestamp, frame->ssrc);
</span><span class="cx"> gen_udp_header(udp_header, RTP_HEADER_LEN + frame->datalen);
</span><span class="lines">@@ -273,17 +280,16 @@
</span><span class="cx">
</span><span class="cx"> memcpy(in_packet_pointer, ip_header, sizeof(ip_header));
</span><span class="cx"> in_packet_pointer += IP_HEADER_LEN;
</span><del>-//
-// memcpy(in_packet_pointer, udp_header, sizeof(udp_header));
-// in_packet_pointer += UDP_HEADER_LEN;
-//
-// memcpy(in_packet_pointer, rtp_header, sizeof(rtp_header));
-// in_packet_pointer += RTP_HEADER_LEN;
-//
-// memcpy(in_packet_pointer, frame->data, frame->datalen);
</del><span class="cx">
</span><del>- size_t packetsize;
- packetsize = sizeof(packet);
</del><ins>+ memcpy(in_packet_pointer, udp_header, sizeof(udp_header));
+ in_packet_pointer += UDP_HEADER_LEN;
+
+ memcpy(in_packet_pointer, rtp_header, sizeof(rtp_header));
+ in_packet_pointer += RTP_HEADER_LEN;
+
+ memcpy(in_packet_pointer, frame->data, frame->datalen);
+
+ size_t packetsize = sizeof(packet);
</ins><span class="cx">
</span><span class="cx"> switch_socket_sendto(pcli_globals.socket, pcli_globals.remote_sockaddr, 0, (void *) packet, &packetsize);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>