<!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][17511] </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=17511">17511</a></dd>
<dt>Author</dt> <dd>math.parent</dd>
<dt>Date</dt> <dd>2010-05-10 11:19:58 -0500 (Mon, 10 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: fix the build</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (17510 => 17511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-05-10 16:19:57 UTC (rev 17510)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-05-10 16:19:58 UTC (rev 17511)
</span><span class="lines">@@ -265,15 +265,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</del><ins>+switch_status_t skinny_session_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> switch_channel_t *channel;
</span><span class="cx">
</span><del>- char *calling_party_name;
- char *calling_party_number;
- char *called_party_name;
- char *called_party_number;
</del><ins>+ const char *calling_party_name;
+ const char *calling_party_number;
+ const char *called_party_name;
+ const char *called_party_number;
</ins><span class="cx"> uint32_t call_type = 0;
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> call_type = SKINNY_INBOUND_CALL;
</span><span class="cx"> }
</span><del>- send_call_info(listener,
</del><ins>+ skinny_send_call_info(listener,
</ins><span class="cx"> calling_party_name, /* char calling_party_name[40], */
</span><span class="cx"> calling_party_number, /* char calling_party[24], */
</span><span class="cx"> called_party_name, /* char called_party_name[40], */
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> send_display_pri_notify(listener, 10 /* message_timeout */, 5 /* priority */, tmp);
</span><span class="cx"> switch_safe_free(tmp);
</span><span class="cx"> }
</span><del>- skinny_send_call_info(helper->tech_pvt->session, listener, line_instance);
</del><ins>+ skinny_session_send_call_info(helper->tech_pvt->session, listener, line_instance);
</ins><span class="cx"> send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_BLINK);
</span><span class="cx"> send_set_ringer(listener, SKINNY_RING_INSIDE, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
</span><span class="cx"> }
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, 10, 0xffff);
</span><span class="cx"> send_display_prompt_status(listener, 0, "\200\037",
</span><span class="cx"> line_instance, helper->tech_pvt->call_id);
</span><del>- skinny_send_call_info(helper->tech_pvt->session, listener, line_instance);
</del><ins>+ skinny_session_send_call_info(helper->tech_pvt->session, listener, line_instance);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx"> tech_pvt->caller_profile->context = switch_core_strdup(tech_pvt->caller_profile->pool, listener->profile->context);
</span><span class="cx"> send_dialed_number(listener, tech_pvt->caller_profile->destination_number, line_instance, tech_pvt->call_id);
</span><span class="cx"> skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_PROCEED);
</span><del>- skinny_send_call_info(session, listener, line_instance);
</del><ins>+ skinny_session_send_call_info(session, listener, line_instance);
</ins><span class="cx">
</span><span class="cx"> skinny_session_start_media(session, listener, line_instance);
</span><span class="cx">
</span><span class="lines">@@ -762,7 +762,7 @@
</span><span class="cx"> SKINNY_KEY_SET_RING_OUT, 0xffff);
</span><span class="cx"> send_display_prompt_status(listener, 0, "\200\026",
</span><span class="cx"> line_instance, tech_pvt->call_id);
</span><del>- skinny_send_call_info(session, listener, line_instance);
</del><ins>+ skinny_session_send_call_info(session, listener, line_instance);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx"> "\200\030",
</span><span class="cx"> line_instance,
</span><span class="cx"> tech_pvt->call_id);
</span><del>- skinny_send_call_info(session, listener, line_instance);
</del><ins>+ skinny_session_send_call_info(session, listener, line_instance);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -902,7 +902,7 @@
</span><span class="cx"> send_select_soft_keys(listener, line_instance, tech_pvt->call_id, SKINNY_KEY_SET_ON_HOLD, 0xffff);
</span><span class="cx"> send_display_prompt_status(listener, 0, "\200\003",
</span><span class="cx"> line_instance, tech_pvt->call_id);
</span><del>- skinny_send_call_info(tech_pvt->session, listener, line_instance);
</del><ins>+ skinny_session_send_call_info(tech_pvt->session, listener, line_instance);
</ins><span class="cx"> send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
</span><span class="cx"> send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
</span><span class="cx">
</span><span class="lines">@@ -1384,24 +1384,24 @@
</span><span class="cx"> return skinny_send_reply(listener, message);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t send_call_info(listener_t *listener,
- char calling_party_name[40],
- char calling_party[24],
- char called_party_name[40],
- char called_party[24],
</del><ins>+switch_status_t skinny_send_call_info(listener_t *listener,
+ const char *calling_party_name,
+ const char *calling_party,
+ const char *called_party_name,
+ const char *called_party,
</ins><span class="cx"> uint32_t line_instance,
</span><span class="cx"> uint32_t call_id,
</span><span class="cx"> uint32_t call_type,
</span><del>- char original_called_party_name[40],
- char original_called_party[24],
- char last_redirecting_party_name[40],
- char last_redirecting_party[24],
</del><ins>+ const char *original_called_party_name,
+ const char *original_called_party,
+ const char *last_redirecting_party_name,
+ const char *last_redirecting_party,
</ins><span class="cx"> uint32_t original_called_party_redirect_reason,
</span><span class="cx"> uint32_t last_redirecting_reason,
</span><del>- char calling_party_voice_mailbox[24],
- char called_party_voice_mailbox[24],
- char original_called_party_voice_mailbox[24],
- char last_redirecting_voice_mailbox[24],
</del><ins>+ const char *calling_party_voice_mailbox,
+ const char *called_party_voice_mailbox,
+ const char *original_called_party_voice_mailbox,
+ const char *last_redirecting_voice_mailbox,
</ins><span class="cx"> uint32_t call_instance,
</span><span class="cx"> uint32_t call_security_status,
</span><span class="cx"> uint32_t party_pi_restriction_bits)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h (17510 => 17511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-05-10 16:19:57 UTC (rev 17510)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-05-10 16:19:58 UTC (rev 17511)
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_device_event(listener_t *listener, switch_event_t **ev, switch_event_types_t event_id, const char *subclass_name);
</span><span class="cx">
</span><del>-switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
</del><ins>+switch_status_t skinny_session_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
</ins><span class="cx"> switch_status_t skinny_session_walk_lines(skinny_profile_t *profile, char *channel_uuid, switch_core_db_callback_func_t callback, void *data);
</span><span class="cx"> switch_call_cause_t skinny_ring_lines(private_t *tech_pvt);
</span><span class="cx">
</span><span class="lines">@@ -703,27 +703,27 @@
</span><span class="cx"> uint32_t conference_id,
</span><span class="cx"> uint32_t pass_thru_party_id,
</span><span class="cx"> uint32_t conference_id2);
</span><del>-switch_status_t send_call_info(listener_t *listener,
- char calling_party_name[40],
- char calling_party[24],
- char called_party_name[40],
- char called_party[24],
- uint32_t line_instance,
- uint32_t call_id,
- uint32_t call_type,
- char original_called_party_name[40],
- char original_called_party[24],
- char last_redirecting_party_name[40],
- char last_redirecting_party[24],
- uint32_t original_called_party_redirect_reason,
- uint32_t last_redirecting_reason,
- char calling_party_voice_mailbox[24],
- char called_party_voice_mailbox[24],
- char original_called_party_voice_mailbox[24],
- char last_redirecting_voice_mailbox[24],
- uint32_t call_instance,
- uint32_t call_security_status,
- uint32_t party_pi_restriction_bits);
</del><ins>+switch_status_t skinny_send_call_info(listener_t *listener,
+ const char *calling_party_name,
+ const char *calling_party,
+ const char *called_party_name,
+ const char *called_party,
+ uint32_t line_instance,
+ uint32_t call_id,
+ uint32_t call_type,
+ const char *original_called_party_name,
+ const char *original_called_party,
+ const char *last_redirecting_party_name,
+ const char *last_redirecting_party,
+ uint32_t original_called_party_redirect_reason,
+ uint32_t last_redirecting_reason,
+ const char *calling_party_voice_mailbox,
+ const char *called_party_voice_mailbox,
+ const char *original_called_party_voice_mailbox,
+ const char *last_redirecting_voice_mailbox,
+ uint32_t call_instance,
+ uint32_t call_security_status,
+ uint32_t party_pi_restriction_bits);
</ins><span class="cx"> switch_status_t send_define_time_date(listener_t *listener,
</span><span class="cx"> uint32_t year,
</span><span class="cx"> uint32_t month,
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>