mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-13 09:36:46 +00:00
merge 1
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4885 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -559,6 +559,8 @@ static int on_disco_default(void *user_data, ikspak *pak)
|
||||
globals.logger(DL_LOG_DEBUG, "FixME!!! node=[%s]\n", node?node:"");
|
||||
} else if (pak->subtype == IKS_TYPE_GET) {
|
||||
if ((iq = iks_new("iq"))) {
|
||||
int all = 0;
|
||||
|
||||
iks_insert_attrib(iq, "from", handle->login);
|
||||
iks_insert_attrib(iq, "to", pak->from->full);
|
||||
iks_insert_attrib(iq, "id", pak->id);
|
||||
@@ -576,13 +578,17 @@ static int on_disco_default(void *user_data, ikspak *pak)
|
||||
if (!(tag = iks_insert (query, "identity"))) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (!strcasecmp(ns, FEATURE_DISCO) && !node) {
|
||||
all++;
|
||||
}
|
||||
|
||||
iks_insert_attrib(tag, "category", "gateway");
|
||||
iks_insert_attrib(tag, "type", "voice");
|
||||
iks_insert_attrib(tag, "name", "LibDingaLing");
|
||||
|
||||
for (x = 0; FEATURES[x].name; x++) {
|
||||
if (!ns || !strcasecmp(ns, FEATURES[x].name)) {
|
||||
if (all || !ns || !strcasecmp(ns, FEATURES[x].name)) {
|
||||
if (!(tag = iks_insert (query, "feature"))) {
|
||||
goto fail;
|
||||
}
|
||||
|
Reference in New Issue
Block a user