<!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][15450] </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=15450">15450</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-11-12 12:34:34 -0600 (Thu, 12 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>removed some cruft - ordering is not right yet</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 (15449 => 15450)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-11-12 16:48:52 UTC (rev 15449)
+++ freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-11-12 18:34:34 UTC (rev 15450)
</span><span class="lines">@@ -61,10 +61,6 @@
</span><span class="cx"> switch_sockaddr_t *remote_sockaddr;
</span><span class="cx"> } pcli_globals;
</span><span class="cx">
</span><del>-// temporary declaration here.. remove after testing is done !!!!
-//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);
-//static switch_status_t send_packet();
-
</del><span class="cx"> typedef struct {
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> uint16_t ini_id;
</span><span class="lines">@@ -142,38 +138,6 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-//static switch_status_t send_packet() {
-// /* create a pcli header */
-// uint32_t pcli_header;
-// pcli_media_direction_t media_direction = PCLI_MEDIA_DIRECTION_FROM_TARGET;
-// uint16_t call_id = 123;
-// uint8_t switch_id = 12;
-// uint16_t ini_id = 10741;
-// gen_pcli_header(&pcli_header, media_direction, call_id, switch_id, ini_id);
-//
-// uint32_t network_byte_order_pcli_header;
-// network_byte_order_pcli_header = htonl(pcli_header);
-//
-// /* create a pcli body */
-// char *pcli_body = "ABCD";
-//
-// /* create a full packet */
-// char *packet; // TODO shouldn't this be unsigned ?
-// packet = malloc(sizeof(network_byte_order_pcli_header) + sizeof(pcli_body));
-// memcpy(packet, &network_byte_order_pcli_header, sizeof(network_byte_order_pcli_header));
-// memcpy(packet + sizeof(network_byte_order_pcli_header), pcli_body, sizeof(pcli_body));
-//
-// size_t packetsize;
-// packetsize = sizeof(packet);
-//
-// //switch_socket_sendto(pcli_globals.socket, remote_sockaddr, 0, packet, &packetsize);
-// switch_socket_sendto(pcli_globals.socket, pcli_globals.remote_sockaddr, 0, packet, &packetsize);
-//
-// return SWITCH_STATUS_SUCCESS;
-//}
-
-
</del><span class="cx"> /* called when SWITCH_EVENT_RELOADXML is sent to this module */
</span><span class="cx"> static void reload_event_handler(switch_event_t *event)
</span><span class="cx"> {
</span><span class="lines">@@ -181,7 +145,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* generate a PacketCable Lawful Intercept header, that can be prepended to an RTP packet */
</span><del>-static switch_status_t gen_pcli_header(char *pcli_header, pcli_media_direction_t media_direction, uint16_t instance_id, uint8_t switch_id, uint16_t ini_id)
</del><ins>+static switch_status_t gen_pcli_header(unsigned char *pcli_header, pcli_media_direction_t media_direction, uint16_t instance_id, uint8_t switch_id, uint16_t ini_id)
</ins><span class="cx"> {
</span><span class="cx"> /* some sanity checks */
</span><span class="cx">
</span><span class="lines">@@ -215,7 +179,8 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t gen_ip_header(char *ip_header, uint16_t payload_size_i)
</del><ins>+/* generate an ip header */
+static switch_status_t gen_ip_header(unsigned char *ip_header, uint16_t payload_size_i)
</ins><span class="cx"> {
</span><span class="cx"> memset(ip_header, 0, sizeof(ip_header)); /* zero */
</span><span class="cx">
</span><span class="lines">@@ -229,7 +194,8 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t gen_udp_header(char *udp_header, uint16_t payload_size_i)
</del><ins>+/* generate a udp header */
+static switch_status_t gen_udp_header(unsigned char *udp_header, uint16_t payload_size_i)
</ins><span class="cx"> {
</span><span class="cx"> memset(udp_header, 0, sizeof(udp_header)); /* zero */
</span><span class="cx">
</span><span class="lines">@@ -239,7 +205,8 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t gen_rtp_header(char *rtp_header, switch_payload_t payload_type, uint16_t seq_i, uint32_t timestamp_i, uint32_t ssrc_i)
</del><ins>+/* generate an rtp header */
+static switch_status_t gen_rtp_header(unsigned char *rtp_header, switch_payload_t payload_type, uint16_t seq_i, uint32_t timestamp_i, uint32_t ssrc_i)
</ins><span class="cx"> {
</span><span class="cx"> memset(rtp_header, 0, sizeof(rtp_header)); /* zero */
</span><span class="cx">
</span><span class="lines">@@ -281,13 +248,13 @@
</span><span class="cx"> switch_frame_t *frame = switch_core_media_bug_get_read_replace_frame(bug);
</span><span class="cx"> print_frame_stats(frame);
</span><span class="cx">
</span><del>- char pcli_header[PCLI_HEADER_LEN];
- char ip_header[IP_HEADER_LEN];
- char udp_header[UDP_HEADER_LEN];
- char rtp_header[RTP_HEADER_LEN];
</del><ins>+ unsigned char pcli_header[PCLI_HEADER_LEN];
+ unsigned char ip_header[IP_HEADER_LEN];
+ unsigned char udp_header[UDP_HEADER_LEN];
+ unsigned char rtp_header[RTP_HEADER_LEN];
</ins><span class="cx">
</span><del>- char packet[PCLI_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + RTP_HEADER_LEN + frame->datalen];
- char *in_packet_pointer; // = packet; // or next line:
</del><ins>+ unsigned char packet[PCLI_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + RTP_HEADER_LEN + frame->datalen];
+ unsigned char *in_packet_pointer; // = packet; // or next line:
</ins><span class="cx"> in_packet_pointer = packet;
</span><span class="cx">
</span><span class="cx"> gen_rtp_header(rtp_header, frame->payload, frame->seq, frame->timestamp, frame->ssrc);
</span><span class="lines">@@ -313,20 +280,7 @@
</span><span class="cx"> size_t packetsize;
</span><span class="cx"> packetsize = sizeof(packet);
</span><span class="cx">
</span><del>- switch_socket_sendto(pcli_globals.socket, pcli_globals.remote_sockaddr, 0, packet, &packetsize);
-
-
- /* since the (fake) rtp header is almost static, we know the size in advance */
- //packet = malloc(packet_len);
-
-// memcpy(packet, frame->data, frame->datalen);
-// packet_len += frame->datalen;
-
- //memcpy(packet, &network_byte_order_pcli_header, sizeof(network_byte_order_pcli_header));
- //memcpy(packet + sizeof(network_byte_order_pcli_header), pcli_body, sizeof(pcli_body));
-
-// free(packet);
-
</del><ins>+ switch_socket_sendto(pcli_globals.socket, pcli_globals.remote_sockaddr, 0, (void *) packet, &packetsize);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -335,9 +289,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
- //send_packet();
-
</del><span class="cx"> return SWITCH_TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>