<!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][15290] </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=15290">15290</a></dd>
<dt>Author</dt> <dd>ledr</dd>
<dt>Date</dt> <dd>2009-10-30 10:40:16 -0500 (Fri, 30 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>sent packet, but header is the wrong way around.. arf</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribledrcmod_pclimod_pclic">freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c</a></li>
<li><a href="#freeswitchtrunkcontribledrcmod_pclipcliconfxml">freeswitch/trunk/contrib/ledr/c/mod_pcli/pcli.conf.xml</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 (15289 => 15290)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-10-30 14:26:17 UTC (rev 15289)
+++ freeswitch/trunk/contrib/ledr/c/mod_pcli/mod_pcli.c 2009-10-30 15:40:16 UTC (rev 15290)
</span><span class="lines">@@ -26,33 +26,24 @@
</span><span class="cx"> * Leon de Rooij <leon@toyos.nl>
</span><span class="cx"> *
</span><span class="cx"> *
</span><del>- * mod_pcli.c -- Packet Cable Lawful Intercept
</del><ins>+ * mod_pcli.c -- PacketCable Lawful Intercept
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> #include <switch.h>
</span><span class="cx">
</span><del>-#define PCLI_HEADER_LEN 32
-#define PCLI_HEADER_LEN_DIRECTION 2
-#define PCLI_HEADER_LEN_CALL_ID 10
-#define PCLI_HEADER_LEN_SWITCH_ID 4
-#define PCLI_HEADER_LEN_INI_ID 16
</del><ins>+SWITCH_MODULE_LOAD_FUNCTION(mod_pcli_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pcli_shutdown);
+SWITCH_MODULE_DEFINITION(mod_pcli, mod_pcli_load, mod_pcli_shutdown, NULL);
</ins><span class="cx">
</span><ins>+SWITCH_STANDARD_APP(pcli_start_function);
</ins><span class="cx">
</span><del>-/*
</del><span class="cx"> typedef enum {
</span><del>- MEDIA_DIRECTION_UNKNOWN,
- MEDIA_DIRECTION_FROM_TARGET,
- MEDIA_DIRECTION_TO_TARGET,
- MEDIA_DIRECTION_MONO_MODE
</del><ins>+ PCLI_MEDIA_DIRECTION_UNKNOWN, /* 0 */
+ PCLI_MEDIA_DIRECTION_FROM_TARGET, /* 1 */
+ PCLI_MEDIA_DIRECTION_TO_TARGET, /* 2 */
+ PCLI_MEDIA_DIRECTION_MONO_MODE /* 3 */
</ins><span class="cx"> } pcli_media_direction_t;
</span><del>-*/
</del><span class="cx">
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_li_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_li_shutdown);
-SWITCH_MODULE_DEFINITION(mod_li, mod_li_load, mod_li_shutdown, NULL);
-
-SWITCH_STANDARD_APP(li_start_function);
-
</del><span class="cx"> static struct {
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> int switch_id;
</span><span class="lines">@@ -61,12 +52,15 @@
</span><span class="cx"> char *remote_addr;
</span><span class="cx"> int remote_port;
</span><span class="cx"> switch_socket_t *socket;
</span><del>-} li_globals;
</del><ins>+} pcli_globals;
</ins><span class="cx">
</span><ins>+// temporary declaration here.. remove after testing is done !!!!
+static switch_status_t gen_pcli_header(uint32_t *pcli_header, pcli_media_direction_t media_direction, uint16_t call_id, uint8_t switch_id, uint16_t ini_id);
+
</ins><span class="cx"> typedef struct {
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx"> char *ini_id;
</span><del>-} li_session_helper_t;
</del><ins>+} pcli_session_helper_t;
</ins><span class="cx">
</span><span class="cx"> /* config item validations */
</span><span class="cx"> static switch_xml_config_int_options_t config_opt_valid_switch_id = { SWITCH_TRUE, 0, SWITCH_TRUE, 15 };
</span><span class="lines">@@ -75,27 +69,28 @@
</span><span class="cx">
</span><span class="cx"> /* config items */
</span><span class="cx"> static switch_xml_config_item_t instructions[] = {
</span><del>- SWITCH_CONFIG_ITEM("switch_id", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &li_globals.switch_id,
</del><ins>+ SWITCH_CONFIG_ITEM("switch_id", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &pcli_globals.switch_id,
</ins><span class="cx"> (void*)0, &config_opt_valid_switch_id, NULL, NULL),
</span><del>- SWITCH_CONFIG_ITEM("local_addr", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &li_globals.local_addr,
</del><ins>+ SWITCH_CONFIG_ITEM("local_addr", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &pcli_globals.local_addr,
</ins><span class="cx"> "localhost", &config_opt_valid_addr, NULL, NULL),
</span><del>- SWITCH_CONFIG_ITEM("local_port", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &li_globals.local_port,
</del><ins>+ SWITCH_CONFIG_ITEM("local_port", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &pcli_globals.local_port,
</ins><span class="cx"> (void*)10741, &config_opt_valid_port, NULL, NULL),
</span><del>- SWITCH_CONFIG_ITEM("remote_addr", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &li_globals.remote_addr,
</del><ins>+ SWITCH_CONFIG_ITEM("remote_addr", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE, &pcli_globals.remote_addr,
</ins><span class="cx"> "localhost", &config_opt_valid_addr, NULL, NULL),
</span><del>- SWITCH_CONFIG_ITEM("remote_port", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &li_globals.remote_port,
</del><ins>+ SWITCH_CONFIG_ITEM("remote_port", SWITCH_CONFIG_INT, CONFIG_RELOADABLE, &pcli_globals.remote_port,
</ins><span class="cx"> (void*)10741, &config_opt_valid_port, NULL, NULL),
</span><span class="cx"> SWITCH_CONFIG_ITEM_END()
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+/* called at startup and reload of the module */
</ins><span class="cx"> static switch_status_t do_config(switch_bool_t reload)
</span><span class="cx"> {
</span><span class="cx"> switch_socket_t *socket = NULL;
</span><span class="cx"> switch_sockaddr_t *local_sockaddr;
</span><span class="cx"> switch_sockaddr_t *remote_sockaddr;
</span><span class="cx">
</span><del>- if (switch_xml_config_parse_module_settings("li.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open li.conf\n");
</del><ins>+ if (switch_xml_config_parse_module_settings("pcli.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open pcli.conf\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,12 +99,12 @@
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Trying to create a udp socket !!\n");
</span><span class="cx">
</span><del>- if (switch_sockaddr_info_get(&local_sockaddr, li_globals.local_addr, SWITCH_UNSPEC, li_globals.local_port, 0, li_globals.pool) != SWITCH_STATUS_SUCCESS || !local_sockaddr) {
</del><ins>+ if (switch_sockaddr_info_get(&local_sockaddr, pcli_globals.local_addr, SWITCH_UNSPEC, pcli_globals.local_port, 0, pcli_globals.pool) != SWITCH_STATUS_SUCCESS || !local_sockaddr) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Local Address Error!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (switch_socket_create(&socket, switch_sockaddr_get_family(local_sockaddr), SOCK_DGRAM, 0, li_globals.pool) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_socket_create(&socket, switch_sockaddr_get_family(local_sockaddr), SOCK_DGRAM, 0, pcli_globals.pool) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Socket Error!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -124,17 +119,36 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- li_globals.socket = socket;
</del><ins>+ pcli_globals.socket = socket;
</ins><span class="cx">
</span><span class="cx"> /* TEST SENDING A PACKET */
</span><del>- if (switch_sockaddr_info_get(&remote_sockaddr, li_globals.remote_addr, SWITCH_UNSPEC, li_globals.remote_port, 0, li_globals.pool) != SWITCH_STATUS_SUCCESS || !remote_sockaddr) {
</del><ins>+ if (switch_sockaddr_info_get(&remote_sockaddr, pcli_globals.remote_addr, SWITCH_UNSPEC, pcli_globals.remote_port, 0, pcli_globals.pool) != SWITCH_STATUS_SUCCESS || !remote_sockaddr) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Remote Address Error!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_size_t len = sizeof("X");
- switch_socket_sendto(li_globals.socket, remote_sockaddr, 0, "X", &len);
</del><ins>+ /* 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);
</ins><span class="cx">
</span><ins>+ /* create a pcli body */
+ char *pcli_body = "ABCD";
+
+ /* create a full packet */
+ char *packet;
+ packet = malloc(sizeof(pcli_header) + sizeof(pcli_body));
+ memcpy(packet, &pcli_header, sizeof(pcli_header));
+ memcpy(packet + sizeof(pcli_header), pcli_body, sizeof(pcli_body));
+
+ size_t packetsize;
+ packetsize = sizeof(packet);
+
+ switch_socket_sendto(pcli_globals.socket, remote_sockaddr, 0, packet, &packetsize);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -146,8 +160,8 @@
</span><span class="cx"> do_config(SWITCH_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-//static switch_status_t gen_pcli_header(uint32_t *pcli_heqader, pcli_media_direction_t media_direction, int call_id, int switch_id, int ini_id)
-static switch_status_t gen_pcli_header(uint32_t *pcli_header, uint8_t media_direction, uint16_t call_id, uint8_t switch_id, uint16_t ini_id)
</del><ins>+/* generate a PacketCable Lawful Intercept header, that can be prepended to an RTP packet */
+static switch_status_t gen_pcli_header(uint32_t *pcli_header, pcli_media_direction_t media_direction, uint16_t call_id, uint8_t switch_id, uint16_t ini_id)
</ins><span class="cx"> {
</span><span class="cx"> *pcli_header = 0;
</span><span class="cx">
</span><span class="lines">@@ -178,12 +192,9 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* necessary for hooking to SWITCH_EVENT_RELOADXML */
-static switch_event_node_t *NODE = NULL;
-
-static switch_bool_t li_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
</del><ins>+static switch_bool_t pcli_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
</ins><span class="cx"> {
</span><del>-// li_session_helper_t *li_session_helper = (li_session_helper_t *) user_data;
</del><ins>+// pcli_session_helper_t *pcli_session_helper = (pcli_session_helper_t *) user_data;
</ins><span class="cx">
</span><span class="cx"> switch (type) {
</span><span class="cx"> case SWITCH_ABC_TYPE_INIT:
</span><span class="lines">@@ -232,12 +243,15 @@
</span><span class="cx"> return SWITCH_TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_STANDARD_APP(li_start_function)
</del><ins>+/* necessary for hooking to SWITCH_EVENT_RELOADXML */
+static switch_event_node_t *NODE = NULL;
+
+SWITCH_STANDARD_APP(pcli_start_function)
</ins><span class="cx"> {
</span><span class="cx"> switch_media_bug_t *bug;
</span><span class="cx"> switch_status_t status;
</span><span class="cx"> switch_channel_t *channel;
</span><del>- li_session_helper_t *li_session_helper;
</del><ins>+ pcli_session_helper_t *pcli_session_helper;
</ins><span class="cx"> const char *p;
</span><span class="cx">
</span><span class="cx"> if (session == NULL)
</span><span class="lines">@@ -246,12 +260,12 @@
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><span class="cx"> /* Is this channel already set? */
</span><del>- bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_li_");
</del><ins>+ bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_pcli_");
</ins><span class="cx"> /* If yes */
</span><span class="cx"> if (bug != NULL) {
</span><span class="cx"> /* If we have a stop remove audio bug */
</span><span class="cx"> if (strcasecmp(data, "stop") == 0) {
</span><del>- switch_channel_set_private(channel, "_li_", NULL);
</del><ins>+ switch_channel_set_private(channel, "_pcli_", NULL);
</ins><span class="cx"> switch_core_media_bug_remove(session, &bug);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -262,43 +276,43 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* create a new li_session_helper */
- li_session_helper = (li_session_helper_t *) switch_core_session_alloc(session, sizeof(li_session_helper_t));
</del><ins>+ /* create a new pcli_session_helper */
+ pcli_session_helper = (pcli_session_helper_t *) switch_core_session_alloc(session, sizeof(pcli_session_helper_t));
</ins><span class="cx">
</span><del>- /* make session available from li_session_helper */
- li_session_helper->session = session;
</del><ins>+ /* make session available from pcli_session_helper */
+ pcli_session_helper->session = session;
</ins><span class="cx">
</span><del>- /* get LI_ID and store in li_session_helper */
</del><ins>+ /* get LI_ID and store in pcli_session_helper */
</ins><span class="cx"> if ((p = switch_channel_get_variable(channel, "LI_ID")) && switch_true(p)) {
</span><del>- li_session_helper->ini_id = switch_core_session_strdup(session, p);
</del><ins>+ pcli_session_helper->ini_id = switch_core_session_strdup(session, p);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No LI_ID was set!\n");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* add the bug */
</span><del>- //status = switch_core_media_bug_add(session, li_callback, li_session_helper, 0, SMBF_BOTH, &bug);
- //status = switch_core_media_bug_add(session, li_callback, li_session_helper, 0, SMBF_READ_STREAM | SMBF_WRITE_STREAM, &bug);
- status = switch_core_media_bug_add(session, li_callback, li_session_helper, 0, SMBF_READ_REPLACE | SMBF_WRITE_REPLACE, &bug);
- //status = switch_core_media_bug_add(session, li_callback, li_session_helper, 0, SMBF_READ_REPLACE, &bug);
</del><ins>+ //status = switch_core_media_bug_add(session, pcli_callback, pcli_session_helper, 0, SMBF_BOTH, &bug);
+ //status = switch_core_media_bug_add(session, pcli_callback, pcli_session_helper, 0, SMBF_READ_STREAM | SMBF_WRITE_STREAM, &bug);
+ status = switch_core_media_bug_add(session, pcli_callback, pcli_session_helper, 0, SMBF_READ_REPLACE | SMBF_WRITE_REPLACE, &bug);
+ //status = switch_core_media_bug_add(session, pcli_callback, pcli_session_helper, 0, SMBF_READ_REPLACE, &bug);
</ins><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure hooking to stream\n");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_channel_set_private(channel, "_li_", bug);
</del><ins>+ switch_channel_set_private(channel, "_pcli_", bug);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_MODULE_LOAD_FUNCTION(mod_li_load)
</del><ins>+SWITCH_MODULE_LOAD_FUNCTION(mod_pcli_load)
</ins><span class="cx"> {
</span><span class="cx"> switch_application_interface_t *app_interface;
</span><span class="cx">
</span><del>- /* initialize li_globals struct */
- memset(&li_globals, 0, sizeof(li_globals));
</del><ins>+ /* initialize pcli_globals struct */
+ memset(&pcli_globals, 0, sizeof(pcli_globals));
</ins><span class="cx">
</span><del>- /* make the pool available from li_globals */
- li_globals.pool = pool;
</del><ins>+ /* make the pool available from pcli_globals */
+ pcli_globals.pool = pool;
</ins><span class="cx">
</span><span class="cx"> /* do config */
</span><span class="cx"> do_config(SWITCH_FALSE);
</span><span class="lines">@@ -306,8 +320,8 @@
</span><span class="cx"> /* connect my internal structure to the blank pointer passed to me */
</span><span class="cx"> *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</span><span class="cx">
</span><del>- /* make the li application available to the system */
- SWITCH_ADD_APP(app_interface, "li", "Lawful Intercept", "Lawful Intercept", li_start_function, "<start>", SAF_NONE);
</del><ins>+ /* make the pcli application available to the system */
+ SWITCH_ADD_APP(app_interface, "pcli", "PacketCable Lawful Intercept", "PacketCable Lawful Intercept", pcli_start_function, "<start>", SAF_NONE);
</ins><span class="cx">
</span><span class="cx"> /* subscribe to reloadxml event, and hook it to reload_event_handler */
</span><span class="cx"> if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, reload_event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) {
</span><span class="lines">@@ -323,9 +337,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_li_shutdown)
</del><ins>+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pcli_shutdown)
</ins><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Lawful Intercept disabled\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "PacketCable Lawful Intercept disabled\n");
</ins><span class="cx">
</span><span class="cx"> /* TODO DESTROY THE SOCKET HERE ! */
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribledrcmod_pclipcliconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/ledr/c/mod_pcli/pcli.conf.xml (15289 => 15290)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/ledr/c/mod_pcli/pcli.conf.xml 2009-10-30 14:26:17 UTC (rev 15289)
+++ freeswitch/trunk/contrib/ledr/c/mod_pcli/pcli.conf.xml 2009-10-30 15:40:16 UTC (rev 15290)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<configuration name="li.conf" description="Lawful Intercept Configuration">
</del><ins>+<configuration name="pcli.conf" description="PacketCable Lawful Intercept Configuration">
</ins><span class="cx">
</span><span class="cx"> <settings>
</span><span class="cx"> <param name="switch_id" value="0"/>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>