[asterisk-commits] mmichelson: branch group/pimp_my_sip r380101 - in /team/group/pimp_my_sip: in...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Jan 25 10:51:22 2013
New Revision: 380101

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380101
Log:
Streamline the way endpoint name is retrieved.

The "name" field of the endpoint was not being set
as expected, and it's not really the way that the
endpoint name should be retrieved anyway. So I removed
the field altogether and have switched to using
ast_sorcery_object_get_id() to get the endpoint name.


Modified:
    team/group/pimp_my_sip/include/asterisk/res_sip.h
    team/group/pimp_my_sip/res/res_sip.c
    team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c

Modified: team/group/pimp_my_sip/include/asterisk/res_sip.h
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/include/asterisk/res_sip.h?view=diff&rev=380101&r1=380100&r2=380101
==============================================================================
--- team/group/pimp_my_sip/include/asterisk/res_sip.h (original)
+++ team/group/pimp_my_sip/include/asterisk/res_sip.h Fri Jan 25 10:51:22 2013
@@ -144,8 +144,6 @@
 struct ast_sip_endpoint {
 	SORCERY_OBJECT(details);
 	AST_DECLARE_STRING_FIELDS(
-		/*! Name of the endpoint */
-		AST_STRING_FIELD(name);
 		/*! Context to send incoming calls to */
 		AST_STRING_FIELD(context);
 	);

Modified: team/group/pimp_my_sip/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip.c?view=diff&rev=380101&r1=380100&r2=380101
==============================================================================
--- team/group/pimp_my_sip/res/res_sip.c (original)
+++ team/group/pimp_my_sip/res/res_sip.c Fri Jan 25 10:51:22 2013
@@ -268,7 +268,6 @@
 		ao2_cleanup(endpoint);
 		return NULL;
 	}
-	ast_string_field_set(endpoint, name, name);
 	return endpoint;
 }
 

Modified: team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c?view=diff&rev=380101&r1=380100&r2=380101
==============================================================================
--- team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c (original)
+++ team/group/pimp_my_sip/res/res_sip_endpoint_identifier_user.c Fri Jan 25 10:51:22 2013
@@ -50,7 +50,7 @@
 	}
 	endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", endpoint_name);
 	if (endpoint) {
-		ast_debug(3, "Retrieved endpoint %s\n", endpoint->name);
+		ast_debug(3, "Retrieved endpoint %s\n", ast_sorcery_object_get_id(endpoint));
 	}
 	return endpoint;
 }