[svn-commits] oej: branch group/set-tonezone-trunk r289181 - in /team/group/set-tonezone-tr...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Sep 29 10:10:24 CDT 2010


Author: oej
Date: Wed Sep 29 10:10:20 2010
New Revision: 289181

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289181
Log:
Lookup the tonezone when we create ast_channel since if we do it the other way,
it could actually have disappeared.

Modified:
    team/group/set-tonezone-trunk/channels/chan_sip.c
    team/group/set-tonezone-trunk/channels/sip/include/sip.h
    team/group/set-tonezone-trunk/include/asterisk/indications.h

Modified: team/group/set-tonezone-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/set-tonezone-trunk/channels/chan_sip.c?view=diff&rev=289181&r1=289180&r2=289181
==============================================================================
--- team/group/set-tonezone-trunk/channels/chan_sip.c (original)
+++ team/group/set-tonezone-trunk/channels/chan_sip.c Wed Sep 29 10:10:20 2010
@@ -686,7 +686,7 @@
 static char default_engine[256];                   /*!< Default RTP engine */
 static int default_maxcallbitrate;                 /*!< Maximum bitrate for call */
 static struct ast_codec_pref default_prefs;        /*!< Default codec prefs */
-static struct ast_tone_zone *default_zone;        /*!< Global tone zone for indications generate by Asterisk (not Dahdi) */
+static char default_zone[MAX_TONEZONE_COUNTRY];        /*!< Default tone zone for channels created from the SIP driver */
 static unsigned int default_transports;            /*!< Default Transports (enum sip_transport) that are acceptable */
 static unsigned int default_primary_transport;     /*!< Default primary Transport (enum sip_transport) for outbound connections to devices */
 /*@}*/
@@ -4920,7 +4920,7 @@
 	ref_proxy(dialog, obproxy_get(dialog, peer));
 	dialog->callgroup = peer->callgroup;
 	dialog->pickupgroup = peer->pickupgroup;
-	dialog->zone = peer->zone;
+	ast_copy_string(dialog->zone, peer->zone, sizeof(dialog->zone));
 	dialog->allowtransfer = peer->allowtransfer;
 	dialog->jointnoncodeccapability = dialog->noncodeccapability;
 	dialog->rtptimeout = peer->rtptimeout;
@@ -6654,7 +6654,9 @@
 	if (!ast_strlen_zero(i->language)) {
 		ast_string_field_set(tmp, language, i->language);
 	}
-	tmp->zone = i->zone;
+	if (!(tmp->zone = ast_get_indication_zone(i->zone))) {
+		ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", i->zone);
+	} 
 	i->owner = tmp;
 	ast_module_ref(ast_module_info->self);
 	ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
@@ -7153,7 +7155,7 @@
 	p->session_modify = TRUE;
 	p->stimer = NULL;
 	p->prefs = default_prefs;		/* Set default codecs for this call */
-	p->zone = default_zone;                 /* Set default tone zone */
+	ast_copy_string(p->zone, default_zone, sizeof(p->zone));
 	p->maxforwards = sip_cfg.default_max_forwards;
 
 	if (intended_method != SIP_OPTIONS) {	/* Peerpoke has it's own system */
@@ -15038,7 +15040,7 @@
 		p->pickupgroup = peer->pickupgroup;
 		p->capability = peer->capability;
 		p->prefs = peer->prefs;
-		p->zone = peer->zone;
+		ast_copy_string(p->zone, peer->zone, sizeof(p->zone));
 		p->jointcapability = peer->capability;
  		if (peer->maxforwards > 0) {
 			p->maxforwards = peer->maxforwards;
@@ -16350,7 +16352,7 @@
 		ast_cli(fd, "  Context      : %s\n", peer->context);
 		ast_cli(fd, "  Subscr.Cont. : %s\n", S_OR(peer->subscribecontext, "<Not set>") );
 		ast_cli(fd, "  Language     : %s\n", peer->language);
-		ast_cli(fd, "  Tonezone     : %s\n", peer->zone != NULL ? peer->zone->country : "<Not set>");
+		ast_cli(fd, "  Tonezone     : %s\n", peer->zone[0] != '\0' ? peer->zone : "<Not set>");
 		if (!ast_strlen_zero(peer->accountcode))
 			ast_cli(fd, "  Accountcode  : %s\n", peer->accountcode);
 		ast_cli(fd, "  AMA flags    : %s\n", ast_cdr_flags2str(peer->amaflags));
@@ -16465,7 +16467,7 @@
 		astman_append(s, "MD5SecretExist: %s\r\n", ast_strlen_zero(peer->md5secret)?"N":"Y");
 		astman_append(s, "Context: %s\r\n", peer->context);
 		astman_append(s, "Language: %s\r\n", peer->language);
-		astman_append(s, "ToneZone: %s\r\n", peer->zone ? peer->zone->country : "<Not set>");
+		astman_append(s, "ToneZone: %s\r\n", peer->zone[0] != '\0' ? peer->zone : "<Not set>");
 		if (!ast_strlen_zero(peer->accountcode))
 			astman_append(s, "Accountcode: %s\r\n", peer->accountcode);
 		astman_append(s, "AMAflags: %s\r\n", ast_cdr_flags2str(peer->amaflags));
@@ -16629,7 +16631,7 @@
 		if (!ast_strlen_zero(user->accountcode))
 			ast_cli(a->fd, "  Accountcode  : %s\n", user->accountcode);
 		ast_cli(a->fd, "  AMA flags    : %s\n", ast_cdr_flags2str(user->amaflags));
-		ast_cli(a->fd, "  Tonezone     : %s\n", user->zone ? user->zone->country : "<Not set>");
+		ast_cli(a->fd, "  Tonezone     : %s\n", user->zone[0] != '\0' ? user->zone : "<Not set>");
 		ast_cli(a->fd, "  Transfer mode: %s\n", transfermode2str(user->allowtransfer));
 		ast_cli(a->fd, "  MaxCallBR    : %d kbps\n", user->maxcallbitrate);
 		ast_cli(a->fd, "  CallingPres  : %s\n", ast_describe_caller_presentation(user->callingpres));
@@ -17074,7 +17076,7 @@
 	ast_cli(a->fd, "  Use ClientCode:         %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[0], SIP_USECLIENTCODE)));
 	ast_cli(a->fd, "  Progress inband:        %s\n", (ast_test_flag(&global_flags[0], SIP_PROG_INBAND) == SIP_PROG_INBAND_NEVER) ? "Never" : (AST_CLI_YESNO(ast_test_flag(&global_flags[0], SIP_PROG_INBAND) != SIP_PROG_INBAND_NO)));
 	ast_cli(a->fd, "  Language:               %s\n", default_language);
-	ast_cli(a->fd, "  Tone zone:              %s\n", default_zone != NULL ? default_zone->country : "<Not set>");
+	ast_cli(a->fd, "  Tone zone:              %s\n", default_zone[0] != '\0' ? default_zone : "<Not set>");
 	ast_cli(a->fd, "  MOH Interpret:          %s\n", default_mohinterpret);
 	ast_cli(a->fd, "  MOH Suggest:            %s\n", default_mohsuggest);
 	ast_cli(a->fd, "  Voice Mail Extension:   %s\n", default_vmexten);
@@ -25686,7 +25688,7 @@
 	peer->pickupgroup = 0;
 	peer->maxms = default_qualify;
 	peer->prefs = default_prefs;
-	peer->zone = default_zone;
+	ast_string_field_set(peer, zone, default_zone);
 	peer->stimer.st_mode_oper = global_st_mode;	/* Session-Timers */
 	peer->stimer.st_ref = global_st_refresher;
 	peer->stimer.st_min_se = global_min_se;
@@ -26054,9 +26056,9 @@
 			} else if (!strcasecmp(v->name, "tonezone")) {
 				struct ast_tone_zone *new_zone;
 				if (!(new_zone = ast_get_indication_zone(v->value))) {
-					ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", v->value);
+					ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone in peer [%s] at line %d. Check indications.conf for available country codes.\n", v->value, peer->name, v->lineno);
 				} else {
-					peer->zone = new_zone;
+					ast_string_field_set(peer, zone, v->value);
 				}
 			} else if (!strcasecmp(v->name, "language")) {
 				ast_string_field_set(peer, language, v->value);
@@ -26656,7 +26658,7 @@
 	default_fromdomain[0] = '\0';
 	default_fromdomainport = 0;
 	default_qualify = DEFAULT_QUALIFY;
-	default_zone = NULL;
+	default_zone[0] = '\0';
 	default_maxcallbitrate = DEFAULT_MAX_CALL_BITRATE;
 	ast_copy_string(default_mohinterpret, DEFAULT_MOHINTERPRET, sizeof(default_mohinterpret));
 	ast_copy_string(default_mohsuggest, DEFAULT_MOHSUGGEST, sizeof(default_mohsuggest));
@@ -26860,9 +26862,9 @@
 		} else if (!strcasecmp(v->name, "tonezone")) {
 			struct ast_tone_zone *new_zone;
 			if (!(new_zone = ast_get_indication_zone(v->value))) {
-				ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone. Check indications.conf for available country codes.\n", v->value);
+				ast_log(LOG_ERROR, "Unknown country code '%s' for tonezone in [general] at line %d. Check indications.conf for available country codes.\n", v->value, v->lineno);
 			} else {
-				default_zone = new_zone;
+				ast_copy_string(default_zone, v->value, sizeof(default_zone));
 			}
 		} else if (!strcasecmp(v->name, "language")) {
 			ast_copy_string(default_language, v->value, sizeof(default_language));

Modified: team/group/set-tonezone-trunk/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/group/set-tonezone-trunk/channels/sip/include/sip.h?view=diff&rev=289181&r1=289180&r2=289181
==============================================================================
--- team/group/set-tonezone-trunk/channels/sip/include/sip.h (original)
+++ team/group/set-tonezone-trunk/channels/sip/include/sip.h Wed Sep 29 10:10:20 2010
@@ -1002,7 +1002,7 @@
 	struct t38properties t38;             /*!< T38 settings */
 	struct ast_sockaddr udptlredirip;     /*!< Where our T.38 UDPTL should be going if not to us */
 	struct ast_udptl *udptl;              /*!< T.38 UDPTL session */
-	struct ast_tone_zone *zone;               /*!< Default tone zone for this dialog */
+	char zone[MAX_TONEZONE_COUNTRY];      /*!< Default tone zone for channels created by this dialog */
 	int callingpres;                      /*!< Calling presentation */
 	int expiry;                         /*!< How long we take to expire */
 	int sessionversion;                 /*!< SDP Session Version */
@@ -1171,6 +1171,7 @@
 		AST_STRING_FIELD(mwi_from);     /*!< Name to place in From header for outgoing NOTIFY requests */
 		AST_STRING_FIELD(engine);       /*!<  RTP Engine to use */
 		AST_STRING_FIELD(unsolicited_mailbox);  /*!< Mailbox to store received unsolicited MWI NOTIFY messages information in */
+		AST_STRING_FIELD(zone);  /*!< Tonezone for this device */
 		);
 	struct sip_socket socket;       /*!< Socket used for this peer */
 	enum sip_transport default_outbound_transport;   /*!< Peer Registration may change the default outbound transport.
@@ -1190,7 +1191,6 @@
 	struct sip_auth *auth;          /*!< Realm authentication list */
 	int amaflags;                   /*!< AMA Flags (for billing) */
 	int callingpres;                /*!< Calling id presentation */
-	struct ast_tone_zone *zone;         /*!< Default tone zone for this device */
 	int inUse;                      /*!< Number of calls in use */
 	int inRinging;                  /*!< Number of calls ringing */
 	int onHold;                     /*!< Peer has someone on hold */

Modified: team/group/set-tonezone-trunk/include/asterisk/indications.h
URL: http://svnview.digium.com/svn/asterisk/team/group/set-tonezone-trunk/include/asterisk/indications.h?view=diff&rev=289181&r1=289180&r2=289181
==============================================================================
--- team/group/set-tonezone-trunk/include/asterisk/indications.h (original)
+++ team/group/set-tonezone-trunk/include/asterisk/indications.h Wed Sep 29 10:10:20 2010
@@ -29,6 +29,8 @@
 #include "asterisk/astobj2.h"
 #include "asterisk/utils.h"
 #include "asterisk/data.h"
+
+#define MAX_TONEZONE_COUNTRY 16
 
 /*!
  * \brief Description of a tone
@@ -72,7 +74,7 @@
  */
 struct ast_tone_zone {
 	/*! \brief Country code that this set of tones is for */
-	char country[16];
+	char country[MAX_TONEZONE_COUNTRY];
 	/*! 
 	 * \brief Text description of the given country.
 	 *




More information about the svn-commits mailing list