index efe51d277ff05c9573091251407a38deb8eb7e70..1dc1d7ced87af33500edbbd8f9708a2c18c1235f 100644 (file)
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
{
va_list args;
va_start(args,fmt);
- vsnprintf(targetWriteBuf, targetWriteBufLen, fmt, args);
+ gchar * buffer = g_strdup_vprintf(fmt, args);
va_end(args) ;
- fprintf(stderr, "Error:%s\n", targetWriteBuf);
+ fprintf(stderr, "Error:%s\n", buffer);
XmppEvent evt(XmppEvent::EVENT_ERROR);
- evt.setData(targetWriteBuf);
+ evt.setData(buffer);
dispatchXmppEvent(evt);
+ g_free(buffer);
}
{
va_list args;
va_start(args,fmt);
- vsnprintf(targetWriteBuf, targetWriteBufLen, fmt, args);
+ gchar * buffer = g_strdup_vprintf(fmt, args);
va_end(args) ;
- //printf("Status:%s\n", targetWriteBuf);
+ //printf("Status:%s\n", buffer);
XmppEvent evt(XmppEvent::EVENT_STATUS);
- evt.setData(targetWriteBuf);
+ evt.setData(buffer);
dispatchXmppEvent(evt);
+ g_free(buffer);
}
"IQ set does not contain a 'from' address because "
"the entity is not registered with the server");
}
- error((char *)errMsg.c_str());
+ error("%s",(char *)errMsg.c_str());
}
else if (id.find("regcancel") != id.npos)
"IQ set does not contain a 'from' address because "
"the entity is not registered with the server");
}
- error((char *)errMsg.c_str());
+ error("%s",(char *)errMsg.c_str());
}
return true;
bool XmppClient::write(char *fmt, ...)
{
+ bool rc = true;
va_list args;
va_start(args,fmt);
- vsnprintf((char *)writeBuf, writeBufLen, fmt,args);
+ gchar * buffer = g_strdup_vprintf(fmt,args);
va_end(args) ;
- status("SEND: %s", writeBuf);
- if (!sock->write((char *)writeBuf))
+ status("SEND: %s", buffer);
+ if (!sock->write(buffer))
{
error("Cannot write to socket");
- return false;
+ rc = false;
}
- return true;
+ g_free(buffer);
+ return rc;
}
{
errMsg.append("some registration information was not provided");
}
- error((char *)errMsg.c_str());
+ error("%s",(char *)errMsg.c_str());
delete elem;
return false;
}
char *fmt =
"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' "
"mechanism='DIGEST-MD5'/>\n";
- if (!write(fmt))
+ if (!write("%s",fmt))
return false;
DOMString recbuf = readStanza();
fmt =
"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>\n";
- if (!write(fmt))
+ if (!write("%s",fmt))
return false;
recbuf = readStanza();
delete elem;
char *fmt =
"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>\n";
- if (!write(fmt))
+ if (!write("%s",fmt))
return false;
recbuf = readStanza();
status("RECV: '%s'\n", recbuf.c_str());
DOMString givenJid, givenResource;
parseJid(givenFullJid, givenJid, givenResource);
status("given user: %s realm: %s, rsrc: %s",
- givenJid.c_str(), givenResource.c_str());
+ givenJid.c_str(), realm.c_str(), givenResource.c_str());
setResource(givenResource);
}
fmt =
"<presence/>\n";
- if (!write(fmt))
+ if (!write("%s",fmt))
return false;
/*
{
char *fmt =
"<presence type='unavailable'/>\n";
- write(fmt);
+ write("%s",fmt);
}
keepGoing = false;
connected = false;