<!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][16788] </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=16788">16788</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-02-24 06:05:34 -0600 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skinny: House cleaning
- Print message types and softkey states instead of their code
- Show line number of calling function
- Replace the remaining send_select_soft_keys by skinny_line_set_state (to keep proper state)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<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_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (16787 => 16788)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:05:26 UTC (rev 16787)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-02-24 12:05:34 UTC (rev 16788)
</span><span class="lines">@@ -242,13 +242,12 @@
</span><span class="cx"> {
</span><span class="cx"> switch_assert(listener);
</span><span class="cx">
</span><del>- if(listener->session[instance]) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[instance]), SWITCH_LOG_DEBUG, "Device %s, line %d State Change %d -> %d\n",
- listener->device_name, instance, listener->line_state[instance], state);
- } else {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Device %s, line %d State Change %d -> %d (no session)\n",
- listener->device_name, instance, listener->line_state[instance], state);
- }
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG,
+ "Device %s, line %d State Change %s (%d) -> %s (%d) (no session)\n",
+ listener->device_name, instance,
+ skinny_soft_key_set2str(listener->line_state[instance]), listener->line_state[instance],
+ skinny_soft_key_set2str(state), state);
+
</ins><span class="cx"> send_select_soft_keys(listener, instance, call_id, state, 0xffff);
</span><span class="cx"> listener->line_state[instance] = state;
</span><span class="cx">
</span><span class="lines">@@ -523,8 +522,7 @@
</span><span class="cx"> SKINNY_ON_HOOK,
</span><span class="cx"> tech_pvt->line,
</span><span class="cx"> tech_pvt->call_id);
</span><del>- send_select_soft_keys(listener, tech_pvt->line, tech_pvt->call_id,
- SKINNY_KEY_SET_ON_HOOK, 0xffff);
</del><ins>+ skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_ON_HOOK, tech_pvt->call_id);
</ins><span class="cx"> /* TODO: DefineTimeDate */
</span><span class="cx"> set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
</span><span class="cx"> set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
</span><span class="lines">@@ -828,8 +826,7 @@
</span><span class="cx"> }
</span><span class="cx"> tech_pvt->listener->session[tech_pvt->line] = nsession;
</span><span class="cx"> send_call_state(tech_pvt->listener, SKINNY_RING_IN, tech_pvt->line, tech_pvt->call_id);
</span><del>- send_select_soft_keys(tech_pvt->listener, tech_pvt->line, tech_pvt->call_id,
- SKINNY_KEY_SET_RING_IN, 0xffff);
</del><ins>+ skinny_line_set_state(tech_pvt->listener, tech_pvt->line, SKINNY_KEY_SET_RING_IN, tech_pvt->call_id);
</ins><span class="cx"> display_prompt_status(tech_pvt->listener, 0, "\200\027tel", tech_pvt->line, tech_pvt->call_id);
</span><span class="cx"> /* displayprinotifiymessage */
</span><span class="cx"> skinny_send_call_info(nsession);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (16787 => 16788)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:26 UTC (rev 16787)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-02-24 12:05:34 UTC (rev 16788)
</span><span class="lines">@@ -35,6 +35,66 @@
</span><span class="cx">
</span><span class="cx"> skinny_globals_t globals;
</span><span class="cx">
</span><ins>+struct skinny_message_type_table {
+ const char *name;
+ uint32_t type;
+};
+
+static struct skinny_message_type_table SKINNY_MESSAGE_TYPES[] = {
+ {"KEEP_ALIVE_MESSAGE", KEEP_ALIVE_MESSAGE},
+ {"REGISTER_MESSAGE", REGISTER_MESSAGE},
+ {"PORT_MESSAGE", PORT_MESSAGE},
+ {"KEYPAD_BUTTON_MESSAGE", KEYPAD_BUTTON_MESSAGE},
+ {"STIMULUS_MESSAGE", STIMULUS_MESSAGE},
+ {"OFF_HOOK_MESSAGE", OFF_HOOK_MESSAGE},
+ {"ON_HOOK_MESSAGE", ON_HOOK_MESSAGE},
+ {"SPEED_DIAL_STAT_REQ_MESSAGE", SPEED_DIAL_STAT_REQ_MESSAGE},
+ {"LINE_STAT_REQ_MESSAGE", LINE_STAT_REQ_MESSAGE},
+ {"CONFIG_STAT_REQ_MESSAGE", CONFIG_STAT_REQ_MESSAGE},
+ {"TIME_DATE_REQ_MESSAGE", TIME_DATE_REQ_MESSAGE},
+ {"BUTTON_TEMPLATE_REQ_MESSAGE", BUTTON_TEMPLATE_REQ_MESSAGE},
+ {"CAPABILITIES_RES_MESSAGE", CAPABILITIES_RES_MESSAGE},
+ {"ALARM_MESSAGE", ALARM_MESSAGE},
+ {"OPEN_RECEIVE_CHANNEL_ACK_MESSAGE", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
+ {"SOFT_KEY_SET_REQ_MESSAGE", SOFT_KEY_SET_REQ_MESSAGE},
+ {"SOFT_KEY_EVENT_MESSAGE", SOFT_KEY_EVENT_MESSAGE},
+ {"UNREGISTER_MESSAGE", UNREGISTER_MESSAGE},
+ {"SOFT_KEY_TEMPLATE_REQ_MESSAGE", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
+ {"HEADSET_STATUS_MESSAGE", HEADSET_STATUS_MESSAGE},
+ {"REGISTER_AVAILABLE_LINES_MESSAGE", REGISTER_AVAILABLE_LINES_MESSAGE},
+ {"REGISTER_ACK_MESSAGE", REGISTER_ACK_MESSAGE},
+ {"START_TONE_MESSAGE", START_TONE_MESSAGE},
+ {"STOP_TONE_MESSAGE", STOP_TONE_MESSAGE},
+ {"SET_RINGER_MESSAGE", SET_RINGER_MESSAGE},
+ {"SET_LAMP_MESSAGE", SET_LAMP_MESSAGE},
+ {"SET_SPEAKER_MODE_MESSAGE", SET_SPEAKER_MODE_MESSAGE},
+ {"START_MEDIA_TRANSMISSION_MESSAGE", START_MEDIA_TRANSMISSION_MESSAGE},
+ {"STOP_MEDIA_TRANSMISSION_MESSAGE", STOP_MEDIA_TRANSMISSION_MESSAGE},
+ {"CALL_INFO_MESSAGE", CALL_INFO_MESSAGE},
+ {"SPEED_DIAL_STAT_RES_MESSAGE", SPEED_DIAL_STAT_RES_MESSAGE},
+ {"LINE_STAT_RES_MESSAGE", LINE_STAT_RES_MESSAGE},
+ {"CONFIG_STAT_RES_MESSAGE", CONFIG_STAT_RES_MESSAGE},
+ {"DEFINE_TIME_DATE_MESSAGE", DEFINE_TIME_DATE_MESSAGE},
+ {"BUTTON_TEMPLATE_RES_MESSAGE", BUTTON_TEMPLATE_RES_MESSAGE},
+ {"CAPABILITIES_REQ_MESSAGE", CAPABILITIES_REQ_MESSAGE},
+ {"REGISTER_REJ_MESSAGE", REGISTER_REJ_MESSAGE},
+ {"KEEP_ALIVE_ACK_MESSAGE", KEEP_ALIVE_ACK_MESSAGE},
+ {"OPEN_RECEIVE_CHANNEL_MESSAGE", OPEN_RECEIVE_CHANNEL_MESSAGE},
+ {"CLOSE_RECEIVE_CHANNEL_MESSAGE", CLOSE_RECEIVE_CHANNEL_MESSAGE},
+ {"SOFT_KEY_TEMPLATE_RES_MESSAGE", SOFT_KEY_TEMPLATE_RES_MESSAGE},
+ {"SOFT_KEY_SET_RES_MESSAGE", SOFT_KEY_SET_RES_MESSAGE},
+ {"SELECT_SOFT_KEYS_MESSAGE", SELECT_SOFT_KEYS_MESSAGE},
+ {"CALL_STATE_MESSAGE", CALL_STATE_MESSAGE},
+ {"DISPLAY_PROMPT_STATUS_MESSAGE", DISPLAY_PROMPT_STATUS_MESSAGE},
+ {"CLEAR_PROMPT_STATUS_MESSAGE", CLEAR_PROMPT_STATUS_MESSAGE},
+ {"ACTIVATE_CALL_PLANE_MESSAGE", ACTIVATE_CALL_PLANE_MESSAGE},
+ {"DIALED_NUMBER_MESSAGE", DIALED_NUMBER_MESSAGE},
+ {"SKINNY_MESSAGE_FIELD_SIZE", SKINNY_MESSAGE_FIELD_SIZE},
+ {"SKINNY_MESSAGE_HEADERSIZE", SKINNY_MESSAGE_HEADERSIZE},
+ {"SKINNY_MESSAGE_MAXSIZE", SKINNY_MESSAGE_MAXSIZE},
+ {NULL, 0}
+};
+
</ins><span class="cx"> struct soft_key_template_definition soft_key_template_default[] = {
</span><span class="cx"> { "\200\001", SOFTKEY_REDIAL },
</span><span class="cx"> { "\200\002", SOFTKEY_NEWCALL },
</span><span class="lines">@@ -58,10 +118,96 @@
</span><span class="cx"> { "\200\120", SOFTKEY_IDIVERT },
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct skinny_key_set_table {
+ const char *name;
+ uint32_t id;
+};
+
+static struct skinny_key_set_table SKINNY_KEY_SETS[] = {
+ {"SKINNY_KEY_SET_ON_HOOK", 0},
+ {"SKINNY_KEY_SET_CONNECTED", 1},
+ {"SKINNY_KEY_SET_ON_HOLD", 2},
+ {"SKINNY_KEY_SET_RING_IN", 3},
+ {"SKINNY_KEY_SET_OFF_HOOK", 4},
+ {"SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER", 5},
+ {"SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT", 6},
+ {"SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE", 7},
+ {"SKINNY_KEY_SET_RING_OUT", 8},
+ {"SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES", 9},
+ {NULL, 0}
+};
+
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* SKINNY FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><ins>+const char *skinny_message_type2str(uint32_t type)
+{
+ uint8_t x;
+ const char *str = "UNKNOWN_MESSAGE";
</ins><span class="cx">
</span><ins>+ for (x = 0; x < (sizeof(SKINNY_MESSAGE_TYPES) / sizeof(struct skinny_message_type_table)) - 1; x++) {
+ if (SKINNY_MESSAGE_TYPES[x].type == type) {
+ str = SKINNY_MESSAGE_TYPES[x].name;
+ break;
+ }
+ }
+
+ return str;
+}
+
+uint32_t skinny_str2message_type(const char *str)
+{
+ uint8_t x;
+ uint32_t type = -1;
+
+ if (*str > 47 && *str < 58) {
+ type = atoi(str);
+ } else {
+ for (x = 0; x < (sizeof(SKINNY_MESSAGE_TYPES) / sizeof(struct skinny_message_type_table)) - 1 && SKINNY_MESSAGE_TYPES[x].name; x++) {
+ if (!strcasecmp(SKINNY_MESSAGE_TYPES[x].name, str)) {
+ type = SKINNY_MESSAGE_TYPES[x].type;
+ break;
+ }
+ }
+ }
+ return type;
+}
+
+/*****************************************************************************/
+const char *skinny_soft_key_set2str(uint32_t id)
+{
+ uint8_t x;
+ const char *str = "UNKNOWN_SOFT_KEY_SET";
+
+ for (x = 0; x < (sizeof(SKINNY_KEY_SETS) / sizeof(struct skinny_key_set_table)) - 1; x++) {
+ if (SKINNY_KEY_SETS[x].id == id) {
+ str = SKINNY_KEY_SETS[x].name;
+ break;
+ }
+ }
+
+ return str;
+}
+
+uint32_t skinny_str2soft_key_set(const char *str)
+{
+ uint8_t x;
+ uint32_t id = -1;
+
+ if (*str > 47 && *str < 58) {
+ id = atoi(str);
+ } else {
+ for (x = 0; x < (sizeof(SKINNY_KEY_SETS) / sizeof(struct skinny_key_set_table)) - 1 && SKINNY_KEY_SETS[x].name; x++) {
+ if (!strcasecmp(SKINNY_KEY_SETS[x].name, str)) {
+ id = SKINNY_KEY_SETS[x].id;
+ break;
+ }
+ }
+ }
+ return id;
+}
+
+/*****************************************************************************/
</ins><span class="cx"> char* skinny_codec2string(enum skinny_codecs skinnycodec)
</span><span class="cx"> {
</span><span class="cx"> switch (skinnycodec) {
</span><span class="lines">@@ -171,9 +317,11 @@
</span><span class="cx"> do_sleep = 0;
</span><span class="cx"> ptr += mlen;
</span><span class="cx"> memcpy(request, mbuf, bytes);
</span><ins>+#ifdef SKINNY_MEGA_DEBUG
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</span><span class="cx"> "Got request: length=%d,reserved=%x,type=%x\n",
</span><span class="cx"> request->length,request->reserved,request->type);
</span><ins>+#endif
</ins><span class="cx"> if(request->length < SKINNY_MESSAGE_FIELD_SIZE) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="cx"> "Skinny client sent invalid data. Length should be greater than 4 but got %d.\n",
</span><span class="lines">@@ -188,9 +336,11 @@
</span><span class="cx"> }
</span><span class="cx"> if(bytes >= request->length + 2*SKINNY_MESSAGE_FIELD_SIZE) {
</span><span class="cx"> /* Message body */
</span><ins>+#ifdef SKINNY_MEGA_DEBUG
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</span><span class="cx"> "Got complete request: length=%d,reserved=%x,type=%x,data=%d\n",
</span><span class="cx"> request->length,request->reserved,request->type,request->data.as_char);
</span><ins>+#endif
</ins><span class="cx"> *req = request;
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1567,7 +1717,7 @@
</span><span class="cx"> switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</span><del>- "Received message (type=%x,length=%d).\n", request->type, request->length);
</del><ins>+ "Received %s (type=%x,length=%d).\n", skinny_message_type2str(request->type), request->type, request->length);
</ins><span class="cx"> if(zstr(listener->device_name) && request->type != REGISTER_MESSAGE && request->type != ALARM_MESSAGE) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="cx"> "Device should send a register message first.\n");
</span><span class="lines">@@ -1624,16 +1774,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_send_reply(listener_t *listener, skinny_message_t *reply)
</del><ins>+switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply)
</ins><span class="cx"> {
</span><span class="cx"> char *ptr;
</span><span class="cx"> switch_size_t len;
</span><span class="cx"> switch_assert(reply != NULL);
</span><span class="cx"> len = reply->length+8;
</span><span class="cx"> ptr = (char *) reply;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Sending reply (type=%x,length=%d).\n",
- reply->type, reply->length);
</del><ins>+
+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG,
+ "Sending %s (type=%x,length=%d).\n",
+ skinny_message_type2str(reply->type), reply->type, reply->length);
</ins><span class="cx"> switch_socket_send(listener->sock, ptr, &len);
</span><ins>+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</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 (16787 => 16788)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-24 12:05:26 UTC (rev 16787)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-02-24 12:05:34 UTC (rev 16788)
</span><span class="lines">@@ -594,9 +594,9 @@
</span><span class="cx"> * body is type+data
</span><span class="cx"> */
</span><span class="cx"> struct skinny_message {
</span><del>- int length;
- int reserved;
- int type;
</del><ins>+ uint32_t length;
+ uint32_t reserved;
+ uint32_t type;
</ins><span class="cx"> union skinny_data data;
</span><span class="cx"> };
</span><span class="cx"> typedef struct skinny_message skinny_message_t;
</span><span class="lines">@@ -652,13 +652,21 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;\
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+const char *skinny_message_type2str(uint32_t type);
+uint32_t skinny_str2message_type(const char *str);
+
+const char *skinny_soft_key_set2str(uint32_t id);
+uint32_t skinny_str2soft_key_set(const char *str);
+
</ins><span class="cx"> switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req);
</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><span class="cx"> switch_status_t skinny_send_call_info(switch_core_session_t *session);
</span><span class="cx">
</span><del>-switch_status_t skinny_send_reply(listener_t *listener, skinny_message_t *reply);
</del><ins>+switch_status_t skinny_perform_send_reply(listener_t *listener, const char *file, const char *func, int line, skinny_message_t *reply);
+#define skinny_send_reply(listener, reply) skinny_perform_send_reply(listener, __FILE__, __SWITCH_FUNC__, __LINE__, reply)
</ins><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_request(listener_t *listener, skinny_message_t *request);
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>