Merge branch 'master' into local-no-dialplan

Author: mkmer

apps/app_rpt.c

@@ -1062,24 +1062,25 @@ static void *perform_statpost(void *data)
 	struct ast_str *response_msg;
 	struct statpost *sp = (struct statpost *) data;
 	struct rpt *myrpt = sp->myrpt;
+	char *url = ast_str_buffer(sp->stats_url);
 
 	if (!curl) {
 		ast_free(sp->stats_url);
 		ast_free(sp);
 		return NULL;
 	}
 
-	response_msg = ast_str_create(50);
+	response_msg = ast_str_create(RPT_AST_STR_INIT_SIZE);
 	if (!response_msg) {
 		ast_free(sp->stats_url);
 		ast_free(sp);
 		curl_easy_cleanup(curl);
 		return NULL;
 	}
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunction);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *) &response_msg);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response_msg);
 	curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-	curl_easy_setopt(curl, CURLOPT_URL, sp->stats_url);
+	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_USERAGENT, AST_CURL_USER_AGENT);
 	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
 
@@ -1088,20 +1089,20 @@ static void *perform_statpost(void *data)
 		if (*error_buffer) { /* Anything in the error buffer? */
 			failed = 1;
 			if (!myrpt->last_statpost_failed) {
-				ast_log(LOG_WARNING, "statpost to URL '%s' failed with error: %s\n", sp->stats_url, error_buffer);
+				ast_log(LOG_WARNING, "statpost to URL '%s' failed with error: %s\n", url, error_buffer);
 			}
 		} else {
 			failed = 1;
 			if (!myrpt->last_statpost_failed) {
-				ast_log(LOG_WARNING, "statpost to URL '%s' failed with error: %s\n", sp->stats_url, curl_easy_strerror(res));
+				ast_log(LOG_WARNING, "statpost to URL '%s' failed with error: %s\n", url, curl_easy_strerror(res));
 			}
 		}
 	} else {
 		curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rescode);
 		if (!is_http_success(rescode)) {
 			failed = 1;
 			if (!myrpt->last_statpost_failed) {
-				ast_log(LOG_WARNING, "statpost to URL '%s' failed with code %ld: %s\n", sp->stats_url, rescode, http_status_text(rescode));
+				ast_log(LOG_WARNING, "statpost to URL '%s' failed with code %ld: %s\n", url, rescode, http_status_text(rescode));
 			}
 		}
 	}
@@ -1115,11 +1116,11 @@ static void *perform_statpost(void *data)
 	return NULL;
 }
 
-static void statpost(struct rpt *myrpt, char *pairs)
+static void statpost(struct rpt *myrpt, struct ast_str *pairs)
 {
 	time_t now;
 	unsigned int seq;
-	int res, len;
+	int res;
 	pthread_t statpost_thread;
 	struct statpost *sp;
 
@@ -1131,17 +1132,19 @@ static void statpost(struct rpt *myrpt, char *pairs)
 		return;
 	}
 
-	len = strlen(pairs) + strlen(myrpt->p.statpost_url) + 200;
-	sp->stats_url = ast_malloc(len);
-
+	sp->stats_url = ast_str_create(RPT_AST_STR_INIT_SIZE);
+	if (!sp->stats_url) {
+		ast_free(sp);
+		return;
+	}
 	ast_mutex_lock(&myrpt->statpost_lock);
 	seq = ++myrpt->statpost_seqno;
 	ast_mutex_unlock(&myrpt->statpost_lock);
 
 	time(&now);
 	sp->myrpt = myrpt;
-	snprintf(sp->stats_url, len, "%s?node=%s&time=%u&seqno=%u%s%s", myrpt->p.statpost_url, myrpt->name, (unsigned int) now, seq,
-		pairs ? "&" : "", S_OR(pairs, ""));
+	ast_str_set(&sp->stats_url, 0, "%s?node=%s&time=%u&seqno=%u%s", myrpt->p.statpost_url, myrpt->name, (unsigned int) now, seq,
+		ast_str_buffer(pairs));
 
 	/* Make the actual cURL call in a separate thread, so we can continue without blocking. */
 	ast_debug(5, "Making statpost to %s\n", sp->stats_url);
@@ -3448,13 +3451,17 @@ static inline void periodic_process_links(struct rpt *myrpt, const int elap)
  */
 static inline void do_key_post(struct rpt *myrpt)
 {
-	char str[100];
+	struct ast_str *str = ast_str_create(RPT_AST_STR_INIT_SIZE);
 	time_t now;
 
+	if (!str) {
+		return;
+	}
 	time(&now);
-	snprintf(str, sizeof(str), "keyed=%d&keytime=%d", myrpt->keyed, myrpt->lastkeyedtime ? ((int) (now - myrpt->lastkeyedtime)) : 0);
+	ast_str_set(&str, 0, "&keyed=%d&keytime=%d", myrpt->keyed, myrpt->lastkeyedtime ? ((int) (now - myrpt->lastkeyedtime)) : 0);
 	rpt_mutex_unlock(&myrpt->lock);
 	statpost(myrpt, str);
+	ast_free(str);
 	rpt_mutex_lock(&myrpt->lock);
 }
 
@@ -3479,7 +3486,7 @@ static inline int do_link_post(struct rpt *myrpt)
 		return -1;
 	}
 	nstr = 0;
-	ast_str_set(&str, 0, "%s", "nodes=");
+	ast_str_set(&str, 0, "%s", "&nodes=");
 	RPT_LIST_TRAVERSE(myrpt->links, l, l_it) {
 		/* if is not a real link, ignore it */
 		if (l->name[0] == '0') {
@@ -3507,7 +3514,7 @@ static inline int do_link_post(struct rpt *myrpt)
 		(int) myrpt->totaltxtime / 1000, myrpt->timeouts, myrpt->totalexecdcommands, myrpt->keyed,
 		myrpt->lastkeyedtime ? ((int) (now - myrpt->lastkeyedtime)) : 0);
 	rpt_mutex_unlock(&myrpt->lock);
-	statpost(myrpt, ast_str_buffer(str));
+	statpost(myrpt, str);
 	rpt_mutex_lock(&myrpt->lock);
 	ast_free(str);
 	return 0;

apps/app_rpt/app_rpt.h

@@ -1105,7 +1105,7 @@ struct nodelog {
 
 struct statpost {
 	struct rpt *myrpt;
-	char *stats_url;
+	struct ast_str *stats_url;
 };
 
 /*! \brief Whether a channel is using a specified technology */

channels/chan_simpleusb.c

@@ -187,6 +187,7 @@ struct chan_simpleusb_pvt {
 
 	char devicenum;
 	char devstr[128];
+	char serial[128];
 	int spkrmax;
 	int micmax;
 	int micplaymax;
@@ -791,14 +792,17 @@ static int load_tune_config(struct chan_simpleusb_pvt *o, const struct ast_confi
 	int opened = 0;
 	int configured = 0;
 	char devstr[sizeof(o->devstr)];
+	char serial[sizeof(o->serial)];
 
 	o->rxmixerset = 500;
 	o->txmixaset = 500;
 	o->txmixbset = 500;
 
 	devstr[0] = '\0';
+	serial[0] = '\0';
 	if (!reload) {
-		o->devstr[0] = 0;
+		o->devstr[0] = '\0';
+		o->serial[0] = '\0';
 	}
 
 	if (!cfg) {
@@ -819,11 +823,13 @@ static int load_tune_config(struct chan_simpleusb_pvt *o, const struct ast_confi
 		CV_UINT("txmixaset", o->txmixaset);
 		CV_UINT("txmixbset", o->txmixbset);
 		CV_STR("devstr", devstr);
+		CV_STR("serial", serial);
 		CV_END;
 	}
 	if (!reload) {
 		/* Using the ternary operator in CV_STR won't work, due to butchering the sizeof, so copy after if needed */
 		strcpy(o->devstr, devstr); /* Safe */
+		strcpy(o->serial, serial); /* Safe */
 	}
 	if (opened) {
 		ast_config_destroy(cfg2);
@@ -893,6 +899,8 @@ static void *hidthread(void *arg)
 	 * with the usb hid device
 	 */
 	while (!o->stophid) {
+		char serial[sizeof(o->serial)] = { '\0' };
+
 		ast_radio_time(&o->lasthidtime);
 		ast_mutex_lock(&usb_dev_lock);
 		o->hasusb = 0;
@@ -913,7 +921,37 @@ static void *hidthread(void *arg)
 		 * found device.
 		 */
 		ast_radio_time(&o->lasthidtime);
-		
+
+		/* If configuration has a serial number defined, find the device */
+		if (!ast_strlen_zero(o->serial)) {
+			int index;
+			char *index_devstr = NULL;
+
+			for (index = 0;; index++) {
+				index_devstr = ast_radio_usb_get_devstr(index);
+				if (ast_strlen_zero(index_devstr)) {
+					/* if no more devices */
+					break;
+				}
+
+				/* get the device serial number */
+				if (ast_radio_usb_get_serial(index_devstr, serial, sizeof(serial)) == 0) {
+					/* if no serial number */
+					continue;
+				}
+
+				if (strcmp(o->serial, serial) == 0) {
+					/*
+					 * We found a device with the matching serial number, set
+					 * the devstr to the matching device.
+					 */
+					ast_log(LOG_NOTICE, "Matched device serial %s to %s\n", o->serial, o->name);
+					ast_copy_string(o->devstr, index_devstr, sizeof(o->devstr));
+					break;
+				}
+			}
+		}
+
 		/* Automatically assign a devstr if one was not specified in the configuration. */
 		if (ast_strlen_zero(o->devstr)) {
 			int index = 0;
@@ -943,6 +981,9 @@ static void *hidthread(void *arg)
 				/* We found an unused device assign it to our node */
 				ast_copy_string(o->devstr, index_devstr, sizeof(o->devstr));
 				ast_log(LOG_NOTICE, "Channel %s: Automatically assigned USB device %s to SimpleUSB channel\n", o->name, o->devstr);
+				if (ast_radio_usb_get_serial(index_devstr, serial, sizeof(serial)) > 0) {
+					ast_copy_string(o->serial, serial, sizeof(o->serial));
+				}
 				break;
 			}
 			if (ast_strlen_zero(o->devstr)) {
@@ -3118,6 +3159,9 @@ static void _menu_print(int fd, struct chan_simpleusb_pvt *o)
 	ast_cli(fd, "Active radio interface is [%s]\n", simpleusb_active);
 	ast_mutex_lock(&usb_dev_lock);
 	ast_cli(fd, "Device String is %s\n", o->devstr);
+	if (!ast_strlen_zero(o->serial)) {
+		ast_cli(fd, "Device Serial is %s\n", o->serial);
+	}
 	ast_mutex_unlock(&usb_dev_lock);
 	ast_cli(fd, "Card is %i\n", ast_radio_usb_get_usbdev(o->devstr));
 	ast_cli(fd, "Rx Level currently set to %d\n", o->rxmixerset);
@@ -3320,7 +3364,36 @@ static void tune_write(struct chan_simpleusb_pvt *o)
 	if (!category) {
 		ast_log(LOG_ERROR, "No category '%s' exists?\n", o->name);
 	} else {
-		CONFIG_UPDATE_STR(devstr);
+		/*
+		 * To simplify channel driver setup we allow the "devstr=" value
+		 * to be empty/blank indicating that we should match the first
+		 * available interface.
+		 *
+		 * This works (and will continue to work) well as long as the
+		 * "devstr=" value in the configuration file remains empty/blank.
+		 * But, if the value is ever provided then we only match interfaces
+		 * with the specified string.  Moving the interface (accidentally
+		 * or intentionally) to a different "port" will result in not
+		 * finding/matching the interface.
+		 *
+		 * To minimize conflicts, we want to avoid writing out the specific
+		 * "devstr=" value to the configuration file unless needed.  Here,
+		 * we check if the current "devstr=" value is empty/blank and
+		 * that there is only a single audio interface connected to the
+		 * system.  If so, we leave the value empty/blank.
+		 */
+		const char *val;
+		char *dev;
+
+		val = ast_variable_retrieve(cfg, o->name, "devstr");
+		dev = ast_radio_usb_get_devstr(1);
+		if (!ast_strlen_zero(val) || !ast_strlen_zero(dev)) {
+			/* if the "devstr=" value exists or there is more than 1 sound device */
+			CONFIG_UPDATE_STR(devstr);
+			if (!ast_strlen_zero(o->serial)) {
+				CONFIG_UPDATE_STR(serial);
+			}
+		}
 		CONFIG_UPDATE_INT(rxmixerset);
 		CONFIG_UPDATE_INT(txmixaset);
 		CONFIG_UPDATE_INT(txmixbset);