mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-16 22:38:38 +00:00
FS-2746 --resolve large xmlrpc update thanks garmt
This commit is contained in:
1 parent
37ecad9903
commit
6b6c83a718
397 files changed
+41821
-33840
No files matched your search
@@ -1 +0,0 @@
|
||||
xmlrpc
|
||||
@@ -21,8 +21,6 @@ INCLUDES = \
|
||||
-Isrcdir/include \
|
||||
-Isrcdir/lib/util/include
|
||||
|
||||
CFLAGS = $(CFLAGS_COMMON) $(INCLUDES) $(CFLAGS_PERSONAL) $(CADD)
|
||||
|
||||
LDFLAGS = $(LADD)
|
||||
|
||||
all: xmlrpc
|
||||
@@ -36,7 +34,7 @@ UTIL_OBJS = \
|
||||
|
||||
UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%)
|
||||
|
||||
DUMPVALUE = srcdir/tools/lib/dumpvalue.o
|
||||
DUMPVALUE = blddir/tools/lib/dumpvalue.o
|
||||
|
||||
# Can we just use $(LIBS) in the link?
|
||||
|
||||
@@ -48,14 +46,14 @@ xmlrpc: $(XMLRPC_OBJS) $(LIBS) $(UTILS)
|
||||
$(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS)
|
||||
|
||||
%.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h
|
||||
$(CC) -c $(CFLAGS) $<
|
||||
$(CC) -c $(CFLAGS_ALL) $<
|
||||
|
||||
# This common.mk dependency makes sure the symlinks get built before
|
||||
# this make file is used for anything.
|
||||
|
||||
$(SRCDIR)/tools/common.mk: srcdir blddir
|
||||
|
||||
include Makefile.depend
|
||||
include depend.mk
|
||||
|
||||
.PHONY: dep
|
||||
dep: dep-common
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
*/
|
||||
|
||||
//#define _GNU_SOURCE
|
||||
#define _XOPEN_SOURCE 600 /* Make sure strdup() is in <string.h> */
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
@@ -55,6 +55,7 @@
|
||||
|
||||
#include "xmlrpc-c/base.h"
|
||||
#include "xmlrpc-c/client.h"
|
||||
#include "xmlrpc-c/string_int.h"
|
||||
|
||||
#define NAME "xmlrpc command line program"
|
||||
#define VERSION "1.0"
|
||||
@@ -259,6 +260,33 @@ buildString(xmlrpc_env * const envP,
|
||||
|
||||
|
||||
|
||||
static void
|
||||
interpretHex(xmlrpc_env * const envP,
|
||||
const char * const valueString,
|
||||
size_t const valueStringSize,
|
||||
unsigned char * const byteString) {
|
||||
|
||||
size_t bsCursor;
|
||||
size_t strCursor;
|
||||
|
||||
for (strCursor = 0, bsCursor = 0;
|
||||
strCursor < valueStringSize && !envP->fault_occurred;
|
||||
) {
|
||||
int rc;
|
||||
|
||||
rc = sscanf(&valueString[strCursor], "%2hhx",
|
||||
&byteString[bsCursor++]);
|
||||
|
||||
if (rc != 1)
|
||||
xmlrpc_faultf(envP, "Invalid hex data '%s'",
|
||||
&valueString[strCursor]);
|
||||
else
|
||||
strCursor += 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
buildBytestring(xmlrpc_env * const envP,
|
||||
const char * const valueString,
|
||||
@@ -269,33 +297,25 @@ buildBytestring(xmlrpc_env * const envP,
|
||||
if (valueStringSize / 2 * 2 != valueStringSize)
|
||||
xmlrpc_faultf(envP, "Hexadecimal text is not an even "
|
||||
"number of characters (it is %u characters)",
|
||||
strlen(valueString));
|
||||
(unsigned)strlen(valueString));
|
||||
else {
|
||||
size_t const byteStringSize = strlen(valueString)/2;
|
||||
|
||||
unsigned char byteString[byteStringSize];
|
||||
size_t bsCursor;
|
||||
size_t strCursor;
|
||||
unsigned char * byteString;
|
||||
|
||||
strCursor = 0;
|
||||
bsCursor = 0;
|
||||
MALLOCARRAY(byteString, byteStringSize);
|
||||
|
||||
while (strCursor < valueStringSize && !envP->fault_occurred) {
|
||||
int rc;
|
||||
if (byteString == NULL)
|
||||
xmlrpc_faultf(envP, "Failed to allocate %u-byte buffer",
|
||||
(unsigned)byteStringSize);
|
||||
else {
|
||||
interpretHex(envP, valueString, valueStringSize, byteString);
|
||||
|
||||
assert(bsCursor < byteStringSize);
|
||||
if (!envP->fault_occurred)
|
||||
*paramPP = xmlrpc_base64_new(envP, byteStringSize, byteString);
|
||||
|
||||
rc = sscanf(&valueString[strCursor], "%2hhx",
|
||||
&byteString[bsCursor++]);
|
||||
|
||||
if (rc != 1)
|
||||
xmlrpc_faultf(envP, "Invalid hex data '%s'",
|
||||
&valueString[strCursor]);
|
||||
else
|
||||
strCursor += 2;
|
||||
free(byteString);
|
||||
}
|
||||
if (!envP->fault_occurred)
|
||||
*paramPP = xmlrpc_base64_new(envP, byteStringSize, byteString);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -409,19 +429,19 @@ computeParameter(xmlrpc_env * const envP,
|
||||
const char * const paramArg,
|
||||
xmlrpc_value ** const paramPP) {
|
||||
|
||||
if (strncmp(paramArg, "s/", 2) == 0)
|
||||
if (xmlrpc_strneq(paramArg, "s/", 2))
|
||||
buildString(envP, ¶mArg[2], paramPP);
|
||||
else if (strncmp(paramArg, "h/", 2) == 0)
|
||||
else if (xmlrpc_strneq(paramArg, "h/", 2))
|
||||
buildBytestring(envP, ¶mArg[2], paramPP);
|
||||
else if (strncmp(paramArg, "i/", 2) == 0)
|
||||
else if (xmlrpc_strneq(paramArg, "i/", 2))
|
||||
buildInt(envP, ¶mArg[2], paramPP);
|
||||
else if (strncmp(paramArg, "I/", 2) == 0)
|
||||
else if (xmlrpc_strneq(paramArg, "I/", 2))
|
||||
buildI8(envP, ¶mArg[2], paramPP);
|
||||
else if (strncmp(paramArg, "d/", 2) == 0)
|
||||
else if (xmlrpc_strneq(paramArg, "d/", 2))
|
||||
buildDouble(envP, ¶mArg[2], paramPP);
|
||||
else if (strncmp(paramArg, "b/", 2) == 0)
|
||||
else if (xmlrpc_strneq(paramArg, "b/", 2))
|
||||
buildBool(envP, ¶mArg[2], paramPP);
|
||||
else if (strncmp(paramArg, "n/", 2) == 0)
|
||||
else if (xmlrpc_strneq(paramArg, "n/", 2))
|
||||
buildNil(envP, ¶mArg[2], paramPP);
|
||||
else {
|
||||
/* It's not in normal type/value format, so we take it to be
|
||||
|
||||
@@ -34,7 +34,7 @@ http://gggeek.damacom.it/debugger/</a>
|
||||
|
||||
<pre>
|
||||
<tt>
|
||||
$ xmlrpc http://xmlrpc.server.net/~bryanh echostring \
|
||||
$ xmlrpc http://xmlrpc.example.com/~bryanh echostring \
|
||||
"s/This is a string"
|
||||
Result:
|
||||
String: This is a string
|
||||
@@ -44,7 +44,7 @@ http://gggeek.damacom.it/debugger/</a>
|
||||
|
||||
<pre>
|
||||
<tt>
|
||||
$ xmlrpc http://xmlrpc.server.net/~bryanh echostring \
|
||||
$ xmlrpc http://xmlrpc.example.com/~bryanh echostring \
|
||||
"This is a string in shortcut syntax"
|
||||
Result:
|
||||
String: This is a string in shortcut syntax
|
||||
@@ -53,7 +53,7 @@ http://gggeek.damacom.it/debugger/</a>
|
||||
</pre>
|
||||
<pre>
|
||||
<tt>
|
||||
$ xmlrpc http://xmlrpc.server.net sample.add i/3 i/5 \
|
||||
$ xmlrpc http://xmlrpc.example.com sample.add i/3 i/5 \
|
||||
transport=curl -curlinterface=eth1 -username=bryanh -password=passw0rd
|
||||
Result:
|
||||
Integer: 8
|
||||
|
||||
Reference in new issue
Block a user