[svn-commits] russell: branch 1.6.2 r184632 - in /branches/1.6.2: ./ include/asterisk/ main...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Mar 27 09:09:45 CDT 2009
Author: russell
Date: Fri Mar 27 09:09:41 2009
New Revision: 184632
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184632
Log:
Merged revisions 184630 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184630 | russell | 2009-03-27 09:00:18 -0500 (Fri, 27 Mar 2009) | 2 lines
Change g_eid to ast_eid_default.
........
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/include/asterisk/utils.h
branches/1.6.2/main/asterisk.c
branches/1.6.2/main/event.c
branches/1.6.2/main/pbx.c
branches/1.6.2/pbx/pbx_dundi.c
branches/1.6.2/res/ais/evt.c
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/include/asterisk/utils.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/include/asterisk/utils.h?view=diff&rev=184632&r1=184631&r2=184632
==============================================================================
--- branches/1.6.2/include/asterisk/utils.h (original)
+++ branches/1.6.2/include/asterisk/utils.h Fri Mar 27 09:09:41 2009
@@ -688,7 +688,7 @@
* This is set in asterisk.conf, or determined automatically by taking the mac
* address of an Ethernet interface on the system.
*/
-extern struct ast_eid g_eid;
+extern struct ast_eid ast_eid_default;
/*!
* \brief Fill in an ast_eid with the default eid of this machine
Modified: branches/1.6.2/main/asterisk.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/asterisk.c?view=diff&rev=184632&r1=184631&r2=184632
==============================================================================
--- branches/1.6.2/main/asterisk.c (original)
+++ branches/1.6.2/main/asterisk.c Fri Mar 27 09:09:41 2009
@@ -182,7 +182,7 @@
/*! @} */
-struct ast_eid g_eid;
+struct ast_eid ast_eid_default;
/* XXX tmpdir is a subdir of the spool directory, and no way to remap it */
char record_cache_dir[AST_CACHE_DIR_LEN] = DEFAULT_TMP_DIR;
@@ -427,7 +427,7 @@
return NULL;
}
- ast_eid_to_str(eid_str, sizeof(eid_str), &g_eid);
+ ast_eid_to_str(eid_str, sizeof(eid_str), &ast_eid_default);
ast_cli(a->fd, "\nPBX Core settings\n");
ast_cli(a->fd, "-----------------\n");
@@ -2817,7 +2817,7 @@
ast_copy_string(cfg_paths.socket_path, DEFAULT_SOCKET, sizeof(cfg_paths.socket_path));
ast_copy_string(cfg_paths.run_dir, DEFAULT_RUN_DIR, sizeof(cfg_paths.run_dir));
- ast_set_default_eid(&g_eid);
+ ast_set_default_eid(&ast_eid_default);
/* no asterisk.conf? no problem, use buildtime config! */
if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) {
@@ -2988,7 +2988,7 @@
struct ast_eid tmp_eid;
if (!ast_str_to_eid(&tmp_eid, v->value)) {
ast_verbose("Successfully set global EID to '%s'\n", v->value);
- g_eid = tmp_eid;
+ ast_eid_default = tmp_eid;
} else
ast_verbose("Invalid Entity ID '%s' provided\n", v->value);
} else if (!strcasecmp(v->name, "lightbackground")) {
Modified: branches/1.6.2/main/event.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/event.c?view=diff&rev=184632&r1=184631&r2=184632
==============================================================================
--- branches/1.6.2/main/event.c (original)
+++ branches/1.6.2/main/event.c Fri Mar 27 09:09:41 2009
@@ -954,7 +954,7 @@
if (!ast_event_get_ie_raw(event, AST_EVENT_IE_EID)) {
/* If the event is originating on this server, add the server's
* entity ID to the event. */
- ast_event_append_ie_raw(&event, AST_EVENT_IE_EID, &g_eid, sizeof(g_eid));
+ ast_event_append_ie_raw(&event, AST_EVENT_IE_EID, &ast_eid_default, sizeof(ast_eid_default));
}
return event;
Modified: branches/1.6.2/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=184632&r1=184631&r2=184632
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Fri Mar 27 09:09:41 2009
@@ -2924,7 +2924,7 @@
} else if (!strcmp(var, "SYSTEMNAME")) {
s = ast_config_AST_SYSTEM_NAME;
} else if (!strcmp(var, "ENTITYID")) {
- ast_eid_to_str(workspace, workspacelen, &g_eid);
+ ast_eid_to_str(workspace, workspacelen, &ast_eid_default);
s = workspace;
}
}
Modified: branches/1.6.2/pbx/pbx_dundi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/pbx/pbx_dundi.c?view=diff&rev=184632&r1=184631&r2=184632
==============================================================================
--- branches/1.6.2/pbx/pbx_dundi.c (original)
+++ branches/1.6.2/pbx/pbx_dundi.c Fri Mar 27 09:09:41 2009
@@ -4614,7 +4614,7 @@
ast_log(LOG_WARNING, "Unable to get host name!\n");
AST_LIST_LOCK(&peers);
- memcpy(&global_eid, &g_eid, sizeof(global_eid));
+ memcpy(&global_eid, &ast_eid_default, sizeof(global_eid));
global_storehistory = 0;
ast_copy_string(secretpath, "dundi", sizeof(secretpath));
Modified: branches/1.6.2/res/ais/evt.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/res/ais/evt.c?view=diff&rev=184632&r1=184631&r2=184632
==============================================================================
--- branches/1.6.2/res/ais/evt.c (original)
+++ branches/1.6.2/res/ais/evt.c Fri Mar 27 09:09:41 2009
@@ -141,7 +141,7 @@
return;
}
- if (!ast_eid_cmp(&g_eid, ast_event_get_ie_raw(event, AST_EVENT_IE_EID))) {
+ if (!ast_eid_cmp(&ast_eid_default, ast_event_get_ie_raw(event, AST_EVENT_IE_EID))) {
/* Don't feed events back in that originated locally. */
return;
}
@@ -183,7 +183,7 @@
ast_log(LOG_DEBUG, "Got an event to forward\n");
- if (ast_eid_cmp(&g_eid, ast_event_get_ie_raw(ast_event, AST_EVENT_IE_EID))) {
+ if (ast_eid_cmp(&ast_eid_default, ast_event_get_ie_raw(ast_event, AST_EVENT_IE_EID))) {
/* If the event didn't originate from this server, don't send it back out. */
ast_log(LOG_DEBUG, "Returning here\n");
return;
More information about the svn-commits
mailing list