1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00

mirror: default to empty name if mirror with no arg

This commit is contained in:
Andy Green 2017-11-03 06:52:07 +08:00
parent 5b62dd284a
commit 9d654abedf

View file

@ -190,7 +190,7 @@ callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
struct mirror_instance *mi = NULL;
const struct a_message *msg;
struct a_message amsg;
char name[300], update_worst, sent_something;
char name[300], update_worst, sent_something, *pn = name;
uint32_t oldest_tail;
int n, count_mi = 0;
@ -206,16 +206,19 @@ callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
if (lws_get_urlarg_by_name(wsi, "mirror", name,
sizeof(name) - 1))
lwsl_debug("get urlarg failed\n");
lwsl_notice("%s: mirror name '%s'\n", __func__, name);
if (strchr(name, '='))
pn = strchr(name, '=') + 1;
lwsl_notice("%s: mirror name '%s'\n", __func__, pn);
/* is there already a mirror instance of this name? */
lws_start_foreach_ll(struct mirror_instance *, mi1,
v->mi_list) {
count_mi++;
if (!strcmp(name, mi1->name)) {
if (!strcmp(pn, mi1->name)) {
/* yes... we will join it */
lwsl_info("Joining existing mi %p '%s'\n", mi1, name);
lwsl_notice("Joining existing mi %p '%s'\n", mi1, pn);
mi = mi1;
break;
}
@ -242,10 +245,10 @@ callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
mi->next = v->mi_list;
v->mi_list = mi;
strcpy(mi->name, name);
strcpy(mi->name, pn);
mi->rx_enabled = 1;
lwsl_info("Created new mi %p '%s'\n", mi, name);
lwsl_notice("Created new mi %p '%s'\n", mi, pn);
}
/* add our pss to list of guys bound to this mi */