<!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][15333] </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=15333">15333</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-11-03 15:07:59 -0600 (Tue, 03 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>more cleanup, always try to get a location
add verbose option to api call
cache area and src so the cache is full rep of cid data</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc">freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (15332 => 15333)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-11-03 18:26:09 UTC (rev 15332)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2009-11-03 21:07:59 UTC (rev 15333)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include <switch.h>
</span><span class="cx"> #include <curl/curl.h>
</span><span class="cx">
</span><ins>+#define SWITCH_REWIND_STREAM(s) s.end = s.data
+
</ins><span class="cx"> /* Prototypes */
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown);
</span><span class="cx"> SWITCH_MODULE_RUNTIME_FUNCTION(mod_cidlookup_runtime);
</span><span class="lines">@@ -42,7 +44,7 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_cidlookup, mod_cidlookup_load, mod_cidlookup_shutdown, NULL);
</span><span class="cx">
</span><del>-static char *SYNTAX = "cidlookup status|number [skipurl] [skipcitystate]";
</del><ins>+static char *SYNTAX = "cidlookup status|number [skipurl] [skipcitystate] [verbose]";
</ins><span class="cx">
</span><span class="cx"> static struct {
</span><span class="cx"> char *url;
</span><span class="lines">@@ -68,7 +70,14 @@
</span><span class="cx"> int err;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct cid_data_obj {
+ char *name;
+ char *area;
+ char *src;
+};
+typedef struct cid_data_obj cid_data_t;
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> struct callback_obj {
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> char *name;
</span><span class="lines">@@ -215,6 +224,7 @@
</span><span class="cx">
</span><span class="cx"> len = strlen(str);
</span><span class="cx"> newstr = switch_core_alloc(pool, len+1);
</span><ins>+ switch_assert(newstr);
</ins><span class="cx"> np = newstr;
</span><span class="cx">
</span><span class="cx"> while(*p) {
</span><span class="lines">@@ -229,14 +239,17 @@
</span><span class="cx"> return newstr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char *check_cache(switch_memory_pool_t *pool, const char *number) {
</del><ins>+static cid_data_t *check_cache(switch_memory_pool_t *pool, const char *number) {
</ins><span class="cx"> char *cmd;
</span><span class="cx"> char *name = NULL;
</span><ins>+ char *area = NULL;
+ char *src = NULL;
+ cid_data_t *cid = NULL;
</ins><span class="cx"> switch_stream_handle_t stream = { 0 };
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_STREAM(stream);
</span><del>- cmd = switch_core_sprintf(pool, "get fs:cidlookup:%s", number);
</del><span class="cx">
</span><ins>+ cmd = switch_core_sprintf(pool, "get fs:cidlookup:name:%s", number);
</ins><span class="cx"> if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (strncmp("-ERR", stream.data, 4)) {
</span><span class="cx"> name = switch_core_strdup(pool, stream.data);
</span><span class="lines">@@ -244,29 +257,86 @@
</span><span class="cx"> name = NULL;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ SWITCH_REWIND_STREAM(stream);
+ cmd = switch_core_sprintf(pool, "get fs:cidlookup:area:%s", number);
+ if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
+ if (strncmp("-ERR", stream.data, 4)) {
+ area = switch_core_strdup(pool, stream.data);
+ } else {
+ area = NULL;
+ }
+ }
+
+ SWITCH_REWIND_STREAM(stream);
+ cmd = switch_core_sprintf(pool, "get fs:cidlookup:src:%s", number);
+ if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
+ if (strncmp("-ERR", stream.data, 4)) {
+ src = switch_core_strdup(pool, stream.data);
+ } else {
+ src = NULL;
+ }
+ }
</ins><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcache: k:'%s', v:'%s'\n", cmd, (name) ? name : "(null)");
</del><ins>+ if (name || area || src) {
+ cid = switch_core_alloc(pool, sizeof(cid_data_t));
+ switch_assert(cid);
+ cid->name = name;
+ cid->area = area;
+ cid->src = src;
+ }
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcache: k:'%s', vn:'%s', va:'%s', vs:'%s'\n",
+ cmd,
+ (name) ? name : "(null)",
+ (area) ? area : "(null)",
+ (src) ? src : "(null)"
+ );
</ins><span class="cx"> switch_safe_free(stream.data);
</span><del>- return name;
</del><ins>+ return cid;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_bool_t set_cache(switch_memory_pool_t *pool, const char *number, const char *cid) {
</del><ins>+switch_bool_t set_cache(switch_memory_pool_t *pool, char *number, cid_data_t *cid) {
</ins><span class="cx"> char *cmd;
</span><span class="cx"> switch_bool_t success = SWITCH_TRUE;
</span><span class="cx"> switch_stream_handle_t stream = { 0 };
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_STREAM(stream);
</span><del>- cmd = switch_core_sprintf(pool, "set fs:cidlookup:%s '%s' %d", number, cid, globals.cache_expire);
</del><ins>+
+ cmd = switch_core_sprintf(pool, "set fs:cidlookup:name:%s '%s' %d", number, cid->name, globals.cache_expire);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcache: %s\n", cmd);
</span><del>-
</del><span class="cx"> if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (strncmp("-ERR", stream.data, 4)) {
</span><span class="cx"> success = SWITCH_TRUE;
</span><span class="cx"> } else {
</span><span class="cx"> success = SWITCH_FALSE;
</span><ins>+ goto done;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ SWITCH_REWIND_STREAM(stream);
+ cmd = switch_core_sprintf(pool, "set fs:cidlookup:area:%s '%s' %d", number, cid->area, globals.cache_expire);
+ if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
+ if (strncmp("-ERR", stream.data, 4)) {
+ success = SWITCH_TRUE;
+ } else {
+ success = SWITCH_FALSE;
+ goto done;
+ }
+ }
+
+ SWITCH_REWIND_STREAM(stream);
+ cmd = switch_core_sprintf(pool, "set fs:cidlookup:src:%s '%s' %d", number, cid->src, globals.cache_expire);
+ if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) {
+ if (strncmp("-ERR", stream.data, 4)) {
+ success = SWITCH_TRUE;
+ } else {
+ success = SWITCH_FALSE;
+ goto done;
+ }
+ }
+
+done:
</ins><span class="cx"> switch_safe_free(stream.data);
</span><span class="cx"> return success;
</span><span class="cx"> }
</span><span class="lines">@@ -339,15 +409,17 @@
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char *do_whitepages_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, char **area)
</del><ins>+static cid_data_t *do_whitepages_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num)
</ins><span class="cx"> {
</span><span class="cx"> char *xml_s = NULL;
</span><span class="cx"> char *query = NULL;
</span><span class="cx"> char *name = NULL;
</span><span class="cx"> char *city = NULL;
</span><span class="cx"> char *state = NULL;
</span><ins>+ char *area = NULL;
</ins><span class="cx"> switch_xml_t xml = NULL;
</span><span class="cx"> switch_xml_t node = NULL;
</span><ins>+ cid_data_t *cid = NULL;
</ins><span class="cx">
</span><span class="cx"> /* NANPA check */
</span><span class="cx"> if (strlen(num) == 11 && num[0] == '1') {
</span><span class="lines">@@ -356,8 +428,6 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_assert(area);
-
</del><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "whitepages-cid", num);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "whitepages-api-key", globals.whitepages_apikey);
</span><span class="cx">
</span><span class="lines">@@ -396,7 +466,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (city || state) {
</span><del>- *area = switch_core_sprintf(pool, "%s %s", city ? city : "", state ? state : "");
</del><ins>+ area = switch_core_sprintf(pool, "%s %s", city ? city : "", state ? state : "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> done:
</span><span class="lines">@@ -408,8 +478,14 @@
</span><span class="cx"> switch_xml_free(xml);
</span><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "whitepages XML: %s\n", xml_s);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "whitepages name: %s, area: %s\n", name ? name : "(null)", *area ? *area : "(null)");
- return name;
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "whitepages name: %s, area: %s\n", name ? name : "(null)", area ? area : "(null)");
+
+ cid = switch_core_alloc(pool, sizeof(cid_data_t));
+ switch_assert(cid);
+
+ cid->name = name;
+ cid->area = area;
+ return cid;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static char *do_db_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, const char *sql) {
</span><span class="lines">@@ -433,12 +509,15 @@
</span><span class="cx"> return name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t skipurl, switch_bool_t skipcitystate) {
</del><ins>+static cid_data_t *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const char *num, switch_bool_t skipurl, switch_bool_t skipcitystate) {
</ins><span class="cx"> char *number = NULL;
</span><span class="cx"> char *name = NULL;
</span><del>- char *area = NULL;
</del><span class="cx"> char *url_query = NULL;
</span><del>- char *src = NULL;
</del><ins>+ cid_data_t *cid = NULL;
+ switch_bool_t save_cache = SWITCH_FALSE;
+
+ cid = switch_core_alloc(pool, sizeof(cid_data_t));
+ switch_assert(cid);
</ins><span class="cx">
</span><span class="cx"> number = string_digitsonly(pool, num);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "caller_id_number", number);
</span><span class="lines">@@ -447,65 +526,77 @@
</span><span class="cx"> if (switch_odbc_available() && globals.master_odbc && globals.sql) {
</span><span class="cx"> name = do_db_lookup(pool, event, number, globals.sql);
</span><span class="cx"> if (name) {
</span><del>- src = "database";
</del><ins>+ cid->name = name;
+ cid->src = "phone_database";
+ goto done;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!name && (globals.url || globals.whitepages_apikey)) {
- if (globals.cache) {
- name = check_cache(pool, number);
- if (name) {
- src = "cache";
- }
</del><ins>+ if (globals.cache) {
+ cid = check_cache(pool, number);
+ if (cid) {
+ cid->src = switch_core_sprintf(pool, "%s (cache)", cid->src);
+ goto done;
</ins><span class="cx"> }
</span><del>- if (!skipurl && !name && globals.whitepages_apikey) {
- name = do_whitepages_lookup(pool, event, number, &area);
- if (area || name) {
- src = "whitepages";
- }
- if (name) {
- if (globals.cache) {
- set_cache(pool, number, name);
- }
- }
</del><ins>+ }
+
+ if (!skipurl && globals.whitepages_apikey) {
+ cid = do_whitepages_lookup(pool, event, number);
+ if (cid && cid->name) { /* only cache if we have a name */
+ save_cache = SWITCH_TRUE;
+ goto done;
</ins><span class="cx"> }
</span><del>- if (!skipurl && !name && globals.url) {
- url_query = switch_event_expand_headers(event, globals.url);
- name = do_lookup_url(pool, event, url_query);
- if (name) {
- src = "url";
- if (globals.cache) {
- set_cache(pool, number, name);
- }
- }
- if (url_query != globals.url) {
- switch_safe_free(url_query);
- }
</del><ins>+ }
+
+ if (!skipurl && globals.url) {
+ url_query = switch_event_expand_headers(event, globals.url);
+ name = do_lookup_url(pool, event, url_query);
+ if (name) {
+ cid->name = name;
+ cid->src = "url";
</ins><span class="cx">
</span><ins>+ save_cache = SWITCH_TRUE;
</ins><span class="cx"> }
</span><ins>+ if (url_query != globals.url) {
+ switch_safe_free(url_query);
+ }
</ins><span class="cx"> }
</span><del>- /* only do the below if we don't know anything about the # and it is a nanpa number */
- if (!area && !name &&
</del><ins>+
+done:
+ /* append area if we can */
+ if (!cid->area &&
</ins><span class="cx"> !skipcitystate &&
</span><span class="cx"> strlen(number) == 11 && number[0] == '1' &&
</span><span class="cx"> switch_odbc_available() && globals.master_odbc && globals.citystate_sql) {
</span><span class="cx">
</span><del>- area = do_db_lookup(pool, event, number, globals.citystate_sql);
- src = "npanxx";
</del><ins>+ name = do_db_lookup(pool, event, number, globals.citystate_sql);
+ if (name) {
+ cid->area = name;
+ if (cid->src) {
+ cid->src = switch_core_sprintf(pool, "%s,%s", cid->src, "npanxx_database");
+ } else {
+ cid->src = "npanxx_database";
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!name && area) {
- name = area;
</del><ins>+ if (!cid->name) {
+ cid->name = "UNKNOWN";
</ins><span class="cx"> }
</span><ins>+ if (!cid->area) {
+ cid->area = "UNKNOWN";
+ }
+ if (!cid->src) {
+ cid->src = "UNKNOWN";
+ }
</ins><span class="cx">
</span><del>- if (!name) {
- name = "UNKNOWN";
</del><ins>+ if (globals.cache && save_cache) {
+ set_cache(pool, number, cid);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cidlookup source: %s\n", src ? src : "none");
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "cidlookup_source", src ? src : "none");
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "cidlookup_area", area ? area : "unknown");
- return name;
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cidlookup source: %s\n", cid->src);
+ return cid;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SWITCH_STANDARD_APP(cidlookup_app_function)
</span><span class="lines">@@ -521,7 +612,7 @@
</span><span class="cx"> switch_event_t *event = NULL;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
</span><del>- char *name = NULL;
</del><ins>+ cid_data_t *cid = NULL;
</ins><span class="cx"> const char *number = NULL;
</span><span class="cx"> switch_bool_t skipurl = SWITCH_FALSE;
</span><span class="cx"> switch_bool_t skipcitystate = SWITCH_FALSE;
</span><span class="lines">@@ -555,18 +646,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (number) {
</span><del>- name = do_lookup(pool, event, number, skipurl, skipcitystate);
</del><ins>+ cid = do_lookup(pool, event, number, skipurl, skipcitystate);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (name && channel) {
</del><ins>+ if (cid && channel) {
</ins><span class="cx"> switch_channel_set_variable(channel, "original_caller_id_name", switch_core_strdup(pool, profile->caller_id_name));
</span><del>- if (!zstr(switch_event_get_header(event, "cidlookup_source"))) {
- switch_channel_set_variable(channel, "cidlookup_source", switch_core_strdup(pool, switch_event_get_header(event, "cidlookup_source")));
</del><ins>+ if (!zstr(cid->src)) {
+ switch_channel_set_variable(channel, "cidlookup_source", cid->src);
</ins><span class="cx"> }
</span><del>- if (!zstr(switch_event_get_header(event, "cidlookup_area"))) {
- switch_channel_set_variable(channel, "cidlookup_area", switch_core_strdup(pool, switch_event_get_header(event, "cidlookup_area")));
</del><ins>+ if (!zstr(cid->area)) {
+ switch_channel_set_variable(channel, "cidlookup_area", cid->area);
</ins><span class="cx"> }
</span><del>- profile->caller_id_name = switch_core_strdup(profile->pool, name);;
</del><ins>+ profile->caller_id_name = switch_core_strdup(profile->pool, cid->name);;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, done);
</span><span class="lines">@@ -585,13 +676,14 @@
</span><span class="cx"> char *argv[4] = { 0 };
</span><span class="cx"> int argc;
</span><span class="cx"> int i;
</span><del>- char *name = NULL;
</del><ins>+ cid_data_t *cid = NULL;
</ins><span class="cx"> char *mydata = NULL;
</span><span class="cx">
</span><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx"> switch_event_t *event = NULL;
</span><span class="cx"> switch_bool_t skipurl = SWITCH_FALSE;
</span><span class="cx"> switch_bool_t skipcitystate = SWITCH_FALSE;
</span><ins>+ switch_bool_t verbose = SWITCH_FALSE;
</ins><span class="cx">
</span><span class="cx"> if (zstr(cmd)) {
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, usage);
</span><span class="lines">@@ -629,12 +721,17 @@
</span><span class="cx"> skipurl = SWITCH_TRUE;
</span><span class="cx"> } else if (!strcasecmp(argv[i], "skipcitystate")) {
</span><span class="cx"> skipcitystate = SWITCH_TRUE;
</span><ins>+ } else if (!strcasecmp(argv[i], "verbose")) {
+ verbose = SWITCH_TRUE;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- name = do_lookup(pool, event, argv[0], skipurl, skipcitystate);
- if (name) {
- stream->write_function(stream, name);
</del><ins>+ cid = do_lookup(pool, event, argv[0], skipurl, skipcitystate);
+ if (cid) {
+ stream->write_function(stream, cid->name);
+ if (verbose) {
+ stream->write_function(stream, " (%s) [%s]", cid->area, cid->src);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "UNKNOWN");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>