<!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][15444] </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=15444">15444</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-11-12 08:16:55 -0600 (Thu, 12 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>need to figure out how to do the hton on char[foo]</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 (15443 => 15444)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-11-12 14:01:44 UTC (rev 15443)
+++ freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-11-12 14:16:55 UTC (rev 15444)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> } pcli_globals;
</span><span class="cx">
</span><span class="cx"> // temporary declaration here.. remove after testing is done !!!!
</span><del>-static switch_status_t gen_pcli_header(char *pcli_header, pcli_media_direction_t media_direction, uint16_t call_id, uint8_t switch_id, uint16_t ini_id);
</del><ins>+//static switch_status_t gen_pcli_header(char *pcli_header, pcli_media_direction_t media_direction, uint16_t call_id, uint8_t switch_id, uint16_t ini_id);
</ins><span class="cx"> //static switch_status_t send_packet();
</span><span class="cx">
</span><span class="cx"> typedef struct {
</span><span class="lines">@@ -213,16 +213,20 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t gen_ip_header(char *ip_header, uint16_t payload_size)
</span><span class="cx"> {
</span><ins>+ memset(ip_header, 0, sizeof(ip_header));
+ *ip_header |= (4); /* Version 4 bits */
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t gen_udp_header(char *udp_header, uint16_t payload_size)
</span><span class="cx"> {
</span><ins>+ memset(udp_header, 0, sizeof(udp_header));
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t gen_rtp_header(char *rtp_header, switch_payload_t payload, uint16_t seq, uint32_t timestamp, uint32_t ssrc)
</span><span class="cx"> {
</span><ins>+ memset(rtp_header, 0, sizeof(rtp_header));
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -246,20 +250,21 @@
</span><span class="cx">
</span><span class="cx"> case SWITCH_ABC_TYPE_READ_REPLACE:
</span><span class="cx"> {
</span><del>- switch_frame_t *rframe = switch_core_media_bug_get_read_replace_frame(bug);
- print_frame_stats(rframe);
</del><ins>+ switch_frame_t *frame = switch_core_media_bug_get_read_replace_frame(bug);
+ print_frame_stats(frame);
</ins><span class="cx">
</span><span class="cx"> char pcli_header[PCLI_HEADER_LEN];
</span><span class="cx"> char ip_header[IP_HEADER_LEN];
</span><span class="cx"> char udp_header[UDP_HEADER_LEN];
</span><span class="cx"> char rtp_header[RTP_HEADER_LEN];
</span><span class="cx">
</span><del>- char packet[PCLI_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + RTP_HEADER_LEN + rframe->datalen];
- char *in_packet_pointer = packet;
</del><ins>+ char packet[PCLI_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + RTP_HEADER_LEN + frame->datalen];
+ char *in_packet_pointer; // = packet; // or next line:
+ in_packet_pointer = packet;
</ins><span class="cx">
</span><del>- gen_rtp_header(rtp_header, rframe->payload, rframe->seq, rframe->timestamp, rframe->ssrc);
- gen_udp_header(udp_header, RTP_HEADER_LEN + rframe->datalen);
- gen_ip_header(ip_header, UDP_HEADER_LEN + RTP_HEADER_LEN + rframe->datalen);
</del><ins>+ gen_rtp_header(rtp_header, frame->payload, frame->seq, frame->timestamp, frame->ssrc);
+ gen_udp_header(udp_header, RTP_HEADER_LEN + frame->datalen);
+ gen_ip_header(ip_header, UDP_HEADER_LEN + RTP_HEADER_LEN + frame->datalen);
</ins><span class="cx"> gen_pcli_header(pcli_header, PCLI_MEDIA_DIRECTION_FROM_TARGET, 1, 1, 1); // 1,1,1 = instance_id, switch_id, ini_id
</span><span class="cx">
</span><span class="cx"> memcpy(in_packet_pointer, pcli_header, sizeof(pcli_header));
</span><span class="lines">@@ -274,13 +279,20 @@
</span><span class="cx"> memcpy(in_packet_pointer, rtp_header, sizeof(rtp_header));
</span><span class="cx"> in_packet_pointer += RTP_HEADER_LEN;
</span><span class="cx">
</span><del>- memcpy(in_packet_pointer, rframe->data, rframe->datalen);
</del><ins>+ memcpy(in_packet_pointer, frame->data, frame->datalen);
</ins><span class="cx">
</span><ins>+
+ size_t packetsize;
+ packetsize = sizeof(packet);
+
+ switch_socket_sendto(pcli_globals.socket, pcli_globals.remote_sockaddr, 0, packet, &packetsize);
+
+
</ins><span class="cx"> /* since the (fake) rtp header is almost static, we know the size in advance */
</span><span class="cx"> //packet = malloc(packet_len);
</span><span class="cx">
</span><del>-// memcpy(packet, rframe->data, rframe->datalen);
-// packet_len += rframe->datalen;
</del><ins>+// memcpy(packet, frame->data, frame->datalen);
+// packet_len += frame->datalen;
</ins><span class="cx">
</span><span class="cx"> //memcpy(packet, &network_byte_order_pcli_header, sizeof(network_byte_order_pcli_header));
</span><span class="cx"> //memcpy(packet + sizeof(network_byte_order_pcli_header), pcli_body, sizeof(pcli_body));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>