From fa5ea9580ba03db711b02020714839e5fd5b2593 Mon Sep 17 00:00:00 2001 From: Fyodor Kovin Date: Tue, 30 Apr 2019 10:12:08 -0400 Subject: [PATCH 1/6] Side deck for plugins - side deck that a plugin can use to link with the functions in the server - script that I used to generate it - header file that has all the functions that are in the side deck Signed-off-by: Fyodor Kovin --- build/gen-side-deck.sh | 15 +++++++++++++++ build/zss.xml | 2 +- h/zss-plugin.h | 12 ++++++++++++ lib/zss.x | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100755 build/gen-side-deck.sh create mode 100644 h/zss-plugin.h create mode 100644 lib/zss.x diff --git a/build/gen-side-deck.sh b/build/gen-side-deck.sh new file mode 100755 index 000000000..fee43a6c0 --- /dev/null +++ b/build/gen-side-deck.sh @@ -0,0 +1,15 @@ +#!/bin/bash +FILES="httpserver.o utils.o dataservice.o json.o alloc.o logging.o" + +cd tmp-zss +dd if=zssServer.x conv=unblock cbs=80 of=side-deck +nm $FILES |grep ' T ' |awk '{ print $3 }' |sort -u >relevant-functions +cat relevant-functions |while read fn; do grep ",'"$fn"'" side-deck; done > side-deck-filtered +# dd doesn't support file tags, while cat does. +cat side-deck-filtered |dd conv=block cbs=80 bs=80 > zss.x +mkdir -p ../../lib +cp zss.x ../../lib +echo Side deck ../../lib/zss.x build successfully out of $FILES + + + diff --git a/build/zss.xml b/build/zss.xml index 1332b3b40..19a1583a0 100644 --- a/build/zss.xml +++ b/build/zss.xml @@ -51,7 +51,7 @@ - + diff --git a/h/zss-plugin.h b/h/zss-plugin.h new file mode 100644 index 000000000..d04d0ada4 --- /dev/null +++ b/h/zss-plugin.h @@ -0,0 +1,12 @@ +#ifndef __ZSS_PLUGIN_H__ +#define __ZSS_PLUGIN_H__ + +#include "zowetypes.h" +#include "httpserver.h" +#include "utils.h" +#include "dataservice.h" +#include "json.h" +#include "alloc.h" +#include "logging.h" + +#endif /* __ZSS_PLUGIN_H__ */ diff --git a/lib/zss.x b/lib/zss.x new file mode 100644 index 000000000..d2e03eb8b --- /dev/null +++ b/lib/zss.x @@ -0,0 +1 @@ + IMPORT CODE,'zssServer','SLHAlloc' IMPORT CODE,'zssServer','SLHFree' IMPORT CODE,'zssServer','addHeader' IMPORT CODE,'zssServer','addIntHeader' IMPORT CODE,'zssServer','addStringHeader' IMPORT CODE,'zssServer','addToStringList' IMPORT CODE,'zssServer','addToStringListUnique' IMPORT CODE,'zssServer','allocECSA' IMPORT CODE,'zssServer','base32Decode' IMPORT CODE,'zssServer','base32Encode' IMPORT CODE,'zssServer','charStreamClose' IMPORT CODE,'zssServer','charStreamEOF' IMPORT CODE,'zssServer','charStreamFree' IMPORT CODE,'zssServer','charStreamGet' IMPORT CODE,'zssServer','charStreamPosition' IMPORT CODE,'zssServer','cleanURLParamValue' IMPORT CODE,'zssServer','closeHTMLTemplate' IMPORT CODE,'zssServer','cnvintst' IMPORT CODE,'zssServer','compareIgnoringCase' IMPORT CODE,'zssServer','compseqs' IMPORT CODE,'zssServer','cons' IMPORT CODE,'zssServer','cons64' IMPORT CODE,'zssServer','convertUnixToISO' IMPORT CODE,'zssServer','decToHex' IMPORT CODE,'zssServer','decimalToOctal' IMPORT CODE,'zssServer','decodeBase64' IMPORT CODE,'zssServer','dequeueHttpRequest' IMPORT CODE,'zssServer','destructivelyUnasciify' IMPORT CODE,'zssServer','dumpBufferToStream' IMPORT CODE,'zssServer','dumpbuffer' IMPORT CODE,'zssServer','dumpbuffer2' IMPORT CODE,'zssServer','dumpbufferA' IMPORT CODE,'zssServer','encodeBase64' IMPORT CODE,'zssServer','extractBasicAuth' IMPORT CODE,'zssServer','finishResponse' IMPORT CODE,'zssServer','firstStringListElt' IMPORT CODE,'zssServer','flushWSJsonPrinting' IMPORT CODE,'zssServer','free31' IMPORT CODE,'zssServer','freeECSA' IMPORT CODE,'zssServer','freeJsonPrinter' IMPORT CODE,'zssServer','freeToken' IMPORT CODE,'zssServer','getCheckedParam' IMPORT CODE,'zssServer','getConfiguredProperty' IMPORT CODE,'zssServer','getHeader' IMPORT CODE,'zssServer','getHeaderLine' IMPORT CODE,'zssServer','getHttpVersion' IMPORT CODE,'zssServer','getLoggingContext' IMPORT CODE,'zssServer','getMimeType' IMPORT CODE,'zssServer','getNextMessage' IMPORT CODE,'zssServer','getQueryParam' IMPORT CODE,'zssServer','getStringToken' IMPORT CODE,'zssServer','hasText' IMPORT CODE,'zssServer','hexFill' IMPORT CODE,'zssServer','hexToDec' IMPORT CODE,'zssServer','hexdump' IMPORT CODE,'zssServer','httpBackgroundHandler' IMPORT CODE,'zssServer','httpServerSetSessionTokenKey' IMPORT CODE,'zssServer','httpWorkElementHandler' IMPORT CODE,'zssServer','indexOf' IMPORT CODE,'zssServer','indexOfString' IMPORT CODE,'zssServer','indexOfStringInsensitive' IMPORT CODE,'zssServer','initBufferedInput' IMPORT CODE,'zssServer','initChunkedOutput' IMPORT CODE,'zssServer','initWSJsonPrinting' IMPORT CODE,'zssServer','initalizeWebPlugin' IMPORT CODE,'zssServer','isBlanks' IMPORT CODE,'zssServer','isCachedCopyModified' IMPORT CODE,'zssServer','isCharAN' IMPORT CODE,'zssServer','isZeros' IMPORT CODE,'zssServer','jsonAddBoolean' IMPORT CODE,'zssServer','jsonAddInt' IMPORT CODE,'zssServer','jsonAddInt64' IMPORT CODE,'zssServer','jsonAddJSONString' IMPORT CODE,'zssServer','jsonAddLimitedString' IMPORT CODE,'zssServer','jsonAddNull' IMPORT CODE,'zssServer','jsonAddString' IMPORT CODE,'zssServer','jsonAddUInt' IMPORT CODE,'zssServer','jsonAddUnterminatedString' IMPORT CODE,'zssServer','jsonArrayContainsString' IMPORT CODE,'zssServer','jsonArrayGetArray' IMPORT CODE,'zssServer','jsonArrayGetBoolean' IMPORT CODE,'zssServer','jsonArrayGetCount' IMPORT CODE,'zssServer','jsonArrayGetItem' IMPORT CODE,'zssServer','jsonArrayGetNumber' IMPORT CODE,'zssServer','jsonArrayGetObject' IMPORT CODE,'zssServer','jsonArrayGetString' IMPORT CODE,'zssServer','jsonArrayProperty' IMPORT CODE,'zssServer','jsonAsArray' IMPORT CODE,'zssServer','jsonAsBoolean' IMPORT CODE,'zssServer','jsonAsNumber' IMPORT CODE,'zssServer','jsonAsObject' IMPORT CODE,'zssServer','jsonAsString' IMPORT CODE,'zssServer','jsonCheckIOErrorFlag' IMPORT CODE,'zssServer','jsonEnablePrettyPrint' IMPORT CODE,'zssServer','jsonEnd' IMPORT CODE,'zssServer','jsonEndArray' IMPORT CODE,'zssServer','jsonEndObject' IMPORT CODE,'zssServer','jsonIntProperty' IMPORT CODE,'zssServer','jsonIsArray' IMPORT CODE,'zssServer','jsonIsBoolean' IMPORT CODE,'zssServer','jsonIsNull' IMPORT CODE,'zssServer','jsonIsNumber' IMPORT CODE,'zssServer','jsonIsObject' IMPORT CODE,'zssServer','jsonIsString' IMPORT CODE,'zssServer','jsonObjectGetArray' IMPORT CODE,'zssServer','jsonObjectGetBoolean' IMPORT CODE,'zssServer','jsonObjectGetFirstProperty' IMPORT CODE,'zssServer','jsonObjectGetNextProperty' IMPORT CODE,'zssServer','jsonObjectGetNumber' IMPORT CODE,'zssServer','jsonObjectGetObject' IMPORT CODE,'zssServer','jsonObjectGetPropertyValue' IMPORT CODE,'zssServer','jsonObjectGetString' IMPORT CODE,'zssServer','jsonObjectHasKey' IMPORT CODE,'zssServer','jsonObjectProperty' IMPORT CODE,'zssServer','jsonParseFile' IMPORT CODE,'zssServer','jsonParseString' IMPORT CODE,'zssServer','jsonParseUnterminatedString' IMPORT CODE,'zssServer','jsonPrint' IMPORT CODE,'zssServer','jsonPrintArray' IMPORT CODE,'zssServer','jsonPrintObject' IMPORT CODE,'zssServer','jsonPrintProperty' IMPORT CODE,'zssServer','jsonPropertyGetKey' IMPORT CODE,'zssServer','jsonPropertyGetValue' IMPORT CODE,'zssServer','jsonSetIOErrorFlag' IMPORT CODE,'zssServer','jsonStart' IMPORT CODE,'zssServer','jsonStartArray' IMPORT CODE,'zssServer','jsonStartObject' IMPORT CODE,'zssServer','jsonStringProperty' IMPORT CODE,'zssServer','jsonVerifyHomogeneity' IMPORT CODE,'zssServer','lastIndexOf' IMPORT CODE,'zssServer','logConfigureComponent' IMPORT CODE,'zssServer','logConfigureDestination' IMPORT CODE,'zssServer','logConfigureDestination2' IMPORT CODE,'zssServer','logConfigureStandardDestinations' IMPORT CODE,'zssServer','logGetLevel' IMPORT CODE,'zssServer','logSetLevel' IMPORT CODE,'zssServer','logShouldTraceInternal' IMPORT CODE,'zssServer','mainHttpLoop' IMPORT CODE,'zssServer','makeBufferCharStream' IMPORT CODE,'zssServer','makeCustomJsonPrinter' IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' IMPORT CODE,'zssServer','makeFileService' IMPORT CODE,'zssServer','makeGeneratedService' IMPORT CODE,'zssServer','makeHTMLForDirectory' IMPORT CODE,'zssServer','makeHttpConversation' IMPORT CODE,'zssServer','makeHttpDataService' IMPORT CODE,'zssServer','makeHttpDataServiceUrlMask' IMPORT CODE,'zssServer','makeHttpRequestParser' IMPORT CODE,'zssServer','makeHttpResponse' IMPORT CODE,'zssServer','makeHttpServer' IMPORT CODE,'zssServer','makeHttpServer2' IMPORT CODE,'zssServer','makeInt64ParamSpec' IMPORT CODE,'zssServer','makeIntParamSpec' IMPORT CODE,'zssServer','makeJSONForDirectory' IMPORT CODE,'zssServer','makeJsonPrinter' IMPORT CODE,'zssServer','makeLocalLoggingContext' IMPORT CODE,'zssServer','makeLoggingContext' IMPORT CODE,'zssServer','makeMessage' IMPORT CODE,'zssServer','makeParamSpec' IMPORT CODE,'zssServer','makeProxyService' IMPORT CODE,'zssServer','makeShortLivedHeap' IMPORT CODE,'zssServer','makeShortLivedHeap64' IMPORT CODE,'zssServer','makeSimpleTemplateService' IMPORT CODE,'zssServer','makeStringList' IMPORT CODE,'zssServer','makeStringParamSpec' IMPORT CODE,'zssServer','makeUtf8JsonPrinter' IMPORT CODE,'zssServer','makeWSEndpoint' IMPORT CODE,'zssServer','makeWSMessageHandler' IMPORT CODE,'zssServer','makeWSSession' IMPORT CODE,'zssServer','makeWebPlugin' IMPORT CODE,'zssServer','makeWebSocketService' IMPORT CODE,'zssServer','malloc31' IMPORT CODE,'zssServer','matchWithWildcards' IMPORT CODE,'zssServer','noisyMalloc' IMPORT CODE,'zssServer','nullTerminate' IMPORT CODE,'zssServer','openHTMLTemplate' IMPORT CODE,'zssServer','padwspcs' IMPORT CODE,'zssServer','parseInitialInt' IMPORT CODE,'zssServer','parseInt' IMPORT CODE,'zssServer','parseURI' IMPORT CODE,'zssServer','parseURLMask' IMPORT CODE,'zssServer','percentEncode' IMPORT CODE,'zssServer','pluginTypeFromString' IMPORT CODE,'zssServer','pluginTypeString' IMPORT CODE,'zssServer','printStderr' IMPORT CODE,'zssServer','printStdout' IMPORT CODE,'zssServer','processHttpFragment' IMPORT CODE,'zssServer','processServiceRequestParams' IMPORT CODE,'zssServer','pseudoRespond' IMPORT CODE,'zssServer','readByte' IMPORT CODE,'zssServer','registerHttpServerModuleWithBase' IMPORT CODE,'zssServer','registerHttpService' IMPORT CODE,'zssServer','registerHttpServiceOfLastResort' IMPORT CODE,'zssServer','removeLocalLoggingContext' IMPORT CODE,'zssServer','removeLoggingContext' IMPORT CODE,'zssServer','reportJSONDataProblem' IMPORT CODE,'zssServer','respondWithChunkedOutputStream' IMPORT CODE,'zssServer','respondWithError' IMPORT CODE,'zssServer','respondWithJsonError' IMPORT CODE,'zssServer','respondWithJsonPrinter' IMPORT CODE,'zssServer','respondWithUnixDirectory' IMPORT CODE,'zssServer','respondWithUnixFileContents' IMPORT CODE,'zssServer','respondWithUnixFileContents2' IMPORT CODE,'zssServer','respondWithUnixFileContentsWithAutocvtMode' IMPORT CODE,'zssServer','respondWithUnixFileNotFound' IMPORT CODE,'zssServer','respondWithXmlPrinter' IMPORT CODE,'zssServer','rpltrmnl' IMPORT CODE,'zssServer','runServiceThread' IMPORT CODE,'zssServer','safeFree' IMPORT CODE,'zssServer','safeFree31' IMPORT CODE,'zssServer','safeFree31Key8' IMPORT CODE,'zssServer','safeFree64' IMPORT CODE,'zssServer','safeFree64ByToken' IMPORT CODE,'zssServer','safeMalloc' IMPORT CODE,'zssServer','safeMalloc2' IMPORT CODE,'zssServer','safeMalloc31' IMPORT CODE,'zssServer','safeMalloc31Key8' IMPORT CODE,'zssServer','safeMalloc64' IMPORT CODE,'zssServer','safeMalloc64ByToken' IMPORT CODE,'zssServer','safeRealloc' IMPORT CODE,'zssServer','serveFile' IMPORT CODE,'zssServer','serveSimpleTemplate' IMPORT CODE,'zssServer','setConfiguredProperty' IMPORT CODE,'zssServer','setContentType' IMPORT CODE,'zssServer','setDefaultJSONRESTHeaders' IMPORT CODE,'zssServer','setHttpAuthTrace' IMPORT CODE,'zssServer','setHttpCloseConversationTrace' IMPORT CODE,'zssServer','setHttpDispatchTrace' IMPORT CODE,'zssServer','setHttpHeadersTrace' IMPORT CODE,'zssServer','setHttpParseTrace' IMPORT CODE,'zssServer','setHttpSocketTrace' IMPORT CODE,'zssServer','setLoggingContext' IMPORT CODE,'zssServer','setResponseStatus' IMPORT CODE,'zssServer','shouldContinueGivenAllowedMethods' IMPORT CODE,'zssServer','simpleHexFill' IMPORT CODE,'zssServer','simpleHexPrint' IMPORT CODE,'zssServer','simpleHexPrintLower' IMPORT CODE,'zssServer','strcopy_safe' IMPORT CODE,'zssServer','streamBinaryForFile' IMPORT CODE,'zssServer','streamTextForFile' IMPORT CODE,'zssServer','streamToSubstitution' IMPORT CODE,'zssServer','stringConcatenate' IMPORT CODE,'zssServer','stringListContains' IMPORT CODE,'zssServer','stringListLast' IMPORT CODE,'zssServer','stringListLength' IMPORT CODE,'zssServer','stringListPrint' IMPORT CODE,'zssServer','strupcase' IMPORT CODE,'zssServer','tknGetAlphanumeric' IMPORT CODE,'zssServer','tknGetDecimal' IMPORT CODE,'zssServer','tknGetNonWhitespace' IMPORT CODE,'zssServer','tknGetQuoted' IMPORT CODE,'zssServer','tknGetStandard' IMPORT CODE,'zssServer','tknGetTerminating' IMPORT CODE,'zssServer','tknInt' IMPORT CODE,'zssServer','tknLength' IMPORT CODE,'zssServer','tknText' IMPORT CODE,'zssServer','tknTextEquals' IMPORT CODE,'zssServer','upchar' IMPORT CODE,'zssServer','writeBytes' IMPORT CODE,'zssServer','writeHeader' IMPORT CODE,'zssServer','writeRequest' IMPORT CODE,'zssServer','writeString' IMPORT CODE,'zssServer','writeTransferChunkHeader' IMPORT CODE,'zssServer','wsSessionMoreInput' IMPORT CODE,'zssServer','zowedump' IMPORT CODE,'zssServer','zowelog' \ No newline at end of file From 2477bbd54d724a676ba7c644a08f7d202053248f Mon Sep 17 00:00:00 2001 From: Fyodor Kovin Date: Fri, 3 May 2019 11:08:23 -0400 Subject: [PATCH 2/6] add http.o and recovery.o to the side deck Signed-off-by: Fyodor Kovin --- build/gen-side-deck.sh | 2 +- lib/zss.x | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/gen-side-deck.sh b/build/gen-side-deck.sh index fee43a6c0..e9a122bdb 100755 --- a/build/gen-side-deck.sh +++ b/build/gen-side-deck.sh @@ -1,5 +1,5 @@ #!/bin/bash -FILES="httpserver.o utils.o dataservice.o json.o alloc.o logging.o" +FILES="recovery.o http.o httpserver.o utils.o dataservice.o json.o alloc.o logging.o" cd tmp-zss dd if=zssServer.x conv=unblock cbs=80 of=side-deck diff --git a/lib/zss.x b/lib/zss.x index d2e03eb8b..8d3aa9e6c 100644 --- a/lib/zss.x +++ b/lib/zss.x @@ -1 +1 @@ - IMPORT CODE,'zssServer','SLHAlloc' IMPORT CODE,'zssServer','SLHFree' IMPORT CODE,'zssServer','addHeader' IMPORT CODE,'zssServer','addIntHeader' IMPORT CODE,'zssServer','addStringHeader' IMPORT CODE,'zssServer','addToStringList' IMPORT CODE,'zssServer','addToStringListUnique' IMPORT CODE,'zssServer','allocECSA' IMPORT CODE,'zssServer','base32Decode' IMPORT CODE,'zssServer','base32Encode' IMPORT CODE,'zssServer','charStreamClose' IMPORT CODE,'zssServer','charStreamEOF' IMPORT CODE,'zssServer','charStreamFree' IMPORT CODE,'zssServer','charStreamGet' IMPORT CODE,'zssServer','charStreamPosition' IMPORT CODE,'zssServer','cleanURLParamValue' IMPORT CODE,'zssServer','closeHTMLTemplate' IMPORT CODE,'zssServer','cnvintst' IMPORT CODE,'zssServer','compareIgnoringCase' IMPORT CODE,'zssServer','compseqs' IMPORT CODE,'zssServer','cons' IMPORT CODE,'zssServer','cons64' IMPORT CODE,'zssServer','convertUnixToISO' IMPORT CODE,'zssServer','decToHex' IMPORT CODE,'zssServer','decimalToOctal' IMPORT CODE,'zssServer','decodeBase64' IMPORT CODE,'zssServer','dequeueHttpRequest' IMPORT CODE,'zssServer','destructivelyUnasciify' IMPORT CODE,'zssServer','dumpBufferToStream' IMPORT CODE,'zssServer','dumpbuffer' IMPORT CODE,'zssServer','dumpbuffer2' IMPORT CODE,'zssServer','dumpbufferA' IMPORT CODE,'zssServer','encodeBase64' IMPORT CODE,'zssServer','extractBasicAuth' IMPORT CODE,'zssServer','finishResponse' IMPORT CODE,'zssServer','firstStringListElt' IMPORT CODE,'zssServer','flushWSJsonPrinting' IMPORT CODE,'zssServer','free31' IMPORT CODE,'zssServer','freeECSA' IMPORT CODE,'zssServer','freeJsonPrinter' IMPORT CODE,'zssServer','freeToken' IMPORT CODE,'zssServer','getCheckedParam' IMPORT CODE,'zssServer','getConfiguredProperty' IMPORT CODE,'zssServer','getHeader' IMPORT CODE,'zssServer','getHeaderLine' IMPORT CODE,'zssServer','getHttpVersion' IMPORT CODE,'zssServer','getLoggingContext' IMPORT CODE,'zssServer','getMimeType' IMPORT CODE,'zssServer','getNextMessage' IMPORT CODE,'zssServer','getQueryParam' IMPORT CODE,'zssServer','getStringToken' IMPORT CODE,'zssServer','hasText' IMPORT CODE,'zssServer','hexFill' IMPORT CODE,'zssServer','hexToDec' IMPORT CODE,'zssServer','hexdump' IMPORT CODE,'zssServer','httpBackgroundHandler' IMPORT CODE,'zssServer','httpServerSetSessionTokenKey' IMPORT CODE,'zssServer','httpWorkElementHandler' IMPORT CODE,'zssServer','indexOf' IMPORT CODE,'zssServer','indexOfString' IMPORT CODE,'zssServer','indexOfStringInsensitive' IMPORT CODE,'zssServer','initBufferedInput' IMPORT CODE,'zssServer','initChunkedOutput' IMPORT CODE,'zssServer','initWSJsonPrinting' IMPORT CODE,'zssServer','initalizeWebPlugin' IMPORT CODE,'zssServer','isBlanks' IMPORT CODE,'zssServer','isCachedCopyModified' IMPORT CODE,'zssServer','isCharAN' IMPORT CODE,'zssServer','isZeros' IMPORT CODE,'zssServer','jsonAddBoolean' IMPORT CODE,'zssServer','jsonAddInt' IMPORT CODE,'zssServer','jsonAddInt64' IMPORT CODE,'zssServer','jsonAddJSONString' IMPORT CODE,'zssServer','jsonAddLimitedString' IMPORT CODE,'zssServer','jsonAddNull' IMPORT CODE,'zssServer','jsonAddString' IMPORT CODE,'zssServer','jsonAddUInt' IMPORT CODE,'zssServer','jsonAddUnterminatedString' IMPORT CODE,'zssServer','jsonArrayContainsString' IMPORT CODE,'zssServer','jsonArrayGetArray' IMPORT CODE,'zssServer','jsonArrayGetBoolean' IMPORT CODE,'zssServer','jsonArrayGetCount' IMPORT CODE,'zssServer','jsonArrayGetItem' IMPORT CODE,'zssServer','jsonArrayGetNumber' IMPORT CODE,'zssServer','jsonArrayGetObject' IMPORT CODE,'zssServer','jsonArrayGetString' IMPORT CODE,'zssServer','jsonArrayProperty' IMPORT CODE,'zssServer','jsonAsArray' IMPORT CODE,'zssServer','jsonAsBoolean' IMPORT CODE,'zssServer','jsonAsNumber' IMPORT CODE,'zssServer','jsonAsObject' IMPORT CODE,'zssServer','jsonAsString' IMPORT CODE,'zssServer','jsonCheckIOErrorFlag' IMPORT CODE,'zssServer','jsonEnablePrettyPrint' IMPORT CODE,'zssServer','jsonEnd' IMPORT CODE,'zssServer','jsonEndArray' IMPORT CODE,'zssServer','jsonEndObject' IMPORT CODE,'zssServer','jsonIntProperty' IMPORT CODE,'zssServer','jsonIsArray' IMPORT CODE,'zssServer','jsonIsBoolean' IMPORT CODE,'zssServer','jsonIsNull' IMPORT CODE,'zssServer','jsonIsNumber' IMPORT CODE,'zssServer','jsonIsObject' IMPORT CODE,'zssServer','jsonIsString' IMPORT CODE,'zssServer','jsonObjectGetArray' IMPORT CODE,'zssServer','jsonObjectGetBoolean' IMPORT CODE,'zssServer','jsonObjectGetFirstProperty' IMPORT CODE,'zssServer','jsonObjectGetNextProperty' IMPORT CODE,'zssServer','jsonObjectGetNumber' IMPORT CODE,'zssServer','jsonObjectGetObject' IMPORT CODE,'zssServer','jsonObjectGetPropertyValue' IMPORT CODE,'zssServer','jsonObjectGetString' IMPORT CODE,'zssServer','jsonObjectHasKey' IMPORT CODE,'zssServer','jsonObjectProperty' IMPORT CODE,'zssServer','jsonParseFile' IMPORT CODE,'zssServer','jsonParseString' IMPORT CODE,'zssServer','jsonParseUnterminatedString' IMPORT CODE,'zssServer','jsonPrint' IMPORT CODE,'zssServer','jsonPrintArray' IMPORT CODE,'zssServer','jsonPrintObject' IMPORT CODE,'zssServer','jsonPrintProperty' IMPORT CODE,'zssServer','jsonPropertyGetKey' IMPORT CODE,'zssServer','jsonPropertyGetValue' IMPORT CODE,'zssServer','jsonSetIOErrorFlag' IMPORT CODE,'zssServer','jsonStart' IMPORT CODE,'zssServer','jsonStartArray' IMPORT CODE,'zssServer','jsonStartObject' IMPORT CODE,'zssServer','jsonStringProperty' IMPORT CODE,'zssServer','jsonVerifyHomogeneity' IMPORT CODE,'zssServer','lastIndexOf' IMPORT CODE,'zssServer','logConfigureComponent' IMPORT CODE,'zssServer','logConfigureDestination' IMPORT CODE,'zssServer','logConfigureDestination2' IMPORT CODE,'zssServer','logConfigureStandardDestinations' IMPORT CODE,'zssServer','logGetLevel' IMPORT CODE,'zssServer','logSetLevel' IMPORT CODE,'zssServer','logShouldTraceInternal' IMPORT CODE,'zssServer','mainHttpLoop' IMPORT CODE,'zssServer','makeBufferCharStream' IMPORT CODE,'zssServer','makeCustomJsonPrinter' IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' IMPORT CODE,'zssServer','makeFileService' IMPORT CODE,'zssServer','makeGeneratedService' IMPORT CODE,'zssServer','makeHTMLForDirectory' IMPORT CODE,'zssServer','makeHttpConversation' IMPORT CODE,'zssServer','makeHttpDataService' IMPORT CODE,'zssServer','makeHttpDataServiceUrlMask' IMPORT CODE,'zssServer','makeHttpRequestParser' IMPORT CODE,'zssServer','makeHttpResponse' IMPORT CODE,'zssServer','makeHttpServer' IMPORT CODE,'zssServer','makeHttpServer2' IMPORT CODE,'zssServer','makeInt64ParamSpec' IMPORT CODE,'zssServer','makeIntParamSpec' IMPORT CODE,'zssServer','makeJSONForDirectory' IMPORT CODE,'zssServer','makeJsonPrinter' IMPORT CODE,'zssServer','makeLocalLoggingContext' IMPORT CODE,'zssServer','makeLoggingContext' IMPORT CODE,'zssServer','makeMessage' IMPORT CODE,'zssServer','makeParamSpec' IMPORT CODE,'zssServer','makeProxyService' IMPORT CODE,'zssServer','makeShortLivedHeap' IMPORT CODE,'zssServer','makeShortLivedHeap64' IMPORT CODE,'zssServer','makeSimpleTemplateService' IMPORT CODE,'zssServer','makeStringList' IMPORT CODE,'zssServer','makeStringParamSpec' IMPORT CODE,'zssServer','makeUtf8JsonPrinter' IMPORT CODE,'zssServer','makeWSEndpoint' IMPORT CODE,'zssServer','makeWSMessageHandler' IMPORT CODE,'zssServer','makeWSSession' IMPORT CODE,'zssServer','makeWebPlugin' IMPORT CODE,'zssServer','makeWebSocketService' IMPORT CODE,'zssServer','malloc31' IMPORT CODE,'zssServer','matchWithWildcards' IMPORT CODE,'zssServer','noisyMalloc' IMPORT CODE,'zssServer','nullTerminate' IMPORT CODE,'zssServer','openHTMLTemplate' IMPORT CODE,'zssServer','padwspcs' IMPORT CODE,'zssServer','parseInitialInt' IMPORT CODE,'zssServer','parseInt' IMPORT CODE,'zssServer','parseURI' IMPORT CODE,'zssServer','parseURLMask' IMPORT CODE,'zssServer','percentEncode' IMPORT CODE,'zssServer','pluginTypeFromString' IMPORT CODE,'zssServer','pluginTypeString' IMPORT CODE,'zssServer','printStderr' IMPORT CODE,'zssServer','printStdout' IMPORT CODE,'zssServer','processHttpFragment' IMPORT CODE,'zssServer','processServiceRequestParams' IMPORT CODE,'zssServer','pseudoRespond' IMPORT CODE,'zssServer','readByte' IMPORT CODE,'zssServer','registerHttpServerModuleWithBase' IMPORT CODE,'zssServer','registerHttpService' IMPORT CODE,'zssServer','registerHttpServiceOfLastResort' IMPORT CODE,'zssServer','removeLocalLoggingContext' IMPORT CODE,'zssServer','removeLoggingContext' IMPORT CODE,'zssServer','reportJSONDataProblem' IMPORT CODE,'zssServer','respondWithChunkedOutputStream' IMPORT CODE,'zssServer','respondWithError' IMPORT CODE,'zssServer','respondWithJsonError' IMPORT CODE,'zssServer','respondWithJsonPrinter' IMPORT CODE,'zssServer','respondWithUnixDirectory' IMPORT CODE,'zssServer','respondWithUnixFileContents' IMPORT CODE,'zssServer','respondWithUnixFileContents2' IMPORT CODE,'zssServer','respondWithUnixFileContentsWithAutocvtMode' IMPORT CODE,'zssServer','respondWithUnixFileNotFound' IMPORT CODE,'zssServer','respondWithXmlPrinter' IMPORT CODE,'zssServer','rpltrmnl' IMPORT CODE,'zssServer','runServiceThread' IMPORT CODE,'zssServer','safeFree' IMPORT CODE,'zssServer','safeFree31' IMPORT CODE,'zssServer','safeFree31Key8' IMPORT CODE,'zssServer','safeFree64' IMPORT CODE,'zssServer','safeFree64ByToken' IMPORT CODE,'zssServer','safeMalloc' IMPORT CODE,'zssServer','safeMalloc2' IMPORT CODE,'zssServer','safeMalloc31' IMPORT CODE,'zssServer','safeMalloc31Key8' IMPORT CODE,'zssServer','safeMalloc64' IMPORT CODE,'zssServer','safeMalloc64ByToken' IMPORT CODE,'zssServer','safeRealloc' IMPORT CODE,'zssServer','serveFile' IMPORT CODE,'zssServer','serveSimpleTemplate' IMPORT CODE,'zssServer','setConfiguredProperty' IMPORT CODE,'zssServer','setContentType' IMPORT CODE,'zssServer','setDefaultJSONRESTHeaders' IMPORT CODE,'zssServer','setHttpAuthTrace' IMPORT CODE,'zssServer','setHttpCloseConversationTrace' IMPORT CODE,'zssServer','setHttpDispatchTrace' IMPORT CODE,'zssServer','setHttpHeadersTrace' IMPORT CODE,'zssServer','setHttpParseTrace' IMPORT CODE,'zssServer','setHttpSocketTrace' IMPORT CODE,'zssServer','setLoggingContext' IMPORT CODE,'zssServer','setResponseStatus' IMPORT CODE,'zssServer','shouldContinueGivenAllowedMethods' IMPORT CODE,'zssServer','simpleHexFill' IMPORT CODE,'zssServer','simpleHexPrint' IMPORT CODE,'zssServer','simpleHexPrintLower' IMPORT CODE,'zssServer','strcopy_safe' IMPORT CODE,'zssServer','streamBinaryForFile' IMPORT CODE,'zssServer','streamTextForFile' IMPORT CODE,'zssServer','streamToSubstitution' IMPORT CODE,'zssServer','stringConcatenate' IMPORT CODE,'zssServer','stringListContains' IMPORT CODE,'zssServer','stringListLast' IMPORT CODE,'zssServer','stringListLength' IMPORT CODE,'zssServer','stringListPrint' IMPORT CODE,'zssServer','strupcase' IMPORT CODE,'zssServer','tknGetAlphanumeric' IMPORT CODE,'zssServer','tknGetDecimal' IMPORT CODE,'zssServer','tknGetNonWhitespace' IMPORT CODE,'zssServer','tknGetQuoted' IMPORT CODE,'zssServer','tknGetStandard' IMPORT CODE,'zssServer','tknGetTerminating' IMPORT CODE,'zssServer','tknInt' IMPORT CODE,'zssServer','tknLength' IMPORT CODE,'zssServer','tknText' IMPORT CODE,'zssServer','tknTextEquals' IMPORT CODE,'zssServer','upchar' IMPORT CODE,'zssServer','writeBytes' IMPORT CODE,'zssServer','writeHeader' IMPORT CODE,'zssServer','writeRequest' IMPORT CODE,'zssServer','writeString' IMPORT CODE,'zssServer','writeTransferChunkHeader' IMPORT CODE,'zssServer','wsSessionMoreInput' IMPORT CODE,'zssServer','zowedump' IMPORT CODE,'zssServer','zowelog' \ No newline at end of file + IMPORT CODE,'zssServer','RCVDSECT' IMPORT CODE,'zssServer','SLHAlloc' IMPORT CODE,'zssServer','SLHFree' IMPORT CODE,'zssServer','addHeader' IMPORT CODE,'zssServer','addIntHeader' IMPORT CODE,'zssServer','addStringHeader' IMPORT CODE,'zssServer','addToStringList' IMPORT CODE,'zssServer','addToStringListUnique' IMPORT CODE,'zssServer','allocECSA' IMPORT CODE,'zssServer','asciify' IMPORT CODE,'zssServer','base32Decode' IMPORT CODE,'zssServer','base32Encode' IMPORT CODE,'zssServer','charStreamClose' IMPORT CODE,'zssServer','charStreamEOF' IMPORT CODE,'zssServer','charStreamFree' IMPORT CODE,'zssServer','charStreamGet' IMPORT CODE,'zssServer','charStreamPosition' IMPORT CODE,'zssServer','cleanURLParamValue' IMPORT CODE,'zssServer','closeHTMLTemplate' IMPORT CODE,'zssServer','cnvintst' IMPORT CODE,'zssServer','compareIgnoringCase' IMPORT CODE,'zssServer','compseqs' IMPORT CODE,'zssServer','cons' IMPORT CODE,'zssServer','cons64' IMPORT CODE,'zssServer','convertUnixToISO' IMPORT CODE,'zssServer','copyString' IMPORT CODE,'zssServer','copyStringToNative' IMPORT CODE,'zssServer','decToHex' IMPORT CODE,'zssServer','decimalToOctal' IMPORT CODE,'zssServer','decodeBase64' IMPORT CODE,'zssServer','dequeueHttpRequest' IMPORT CODE,'zssServer','destructivelyNativize' IMPORT CODE,'zssServer','destructivelyUnasciify' IMPORT CODE,'zssServer','dumpBufferToStream' IMPORT CODE,'zssServer','dumpbuffer' IMPORT CODE,'zssServer','dumpbuffer2' IMPORT CODE,'zssServer','dumpbufferA' IMPORT CODE,'zssServer','encodeBase64' IMPORT CODE,'zssServer','extractBasicAuth' IMPORT CODE,'zssServer','finishResponse' IMPORT CODE,'zssServer','firstStringListElt' IMPORT CODE,'zssServer','flushWSJsonPrinting' IMPORT CODE,'zssServer','free31' IMPORT CODE,'zssServer','freeECSA' IMPORT CODE,'zssServer','freeJsonPrinter' IMPORT CODE,'zssServer','freeToken' IMPORT CODE,'zssServer','getCheckedParam' IMPORT CODE,'zssServer','getConfiguredProperty' IMPORT CODE,'zssServer','getHeader' IMPORT CODE,'zssServer','getHeaderLine' IMPORT CODE,'zssServer','getHttpVersion' IMPORT CODE,'zssServer','getLoggingContext' IMPORT CODE,'zssServer','getMimeType' IMPORT CODE,'zssServer','getNextMessage' IMPORT CODE,'zssServer','getQueryParam' IMPORT CODE,'zssServer','getRecoveryContext' IMPORT CODE,'zssServer','getStringToken' IMPORT CODE,'zssServer','hasText' IMPORT CODE,'zssServer','headerMatch' IMPORT CODE,'zssServer','hexFill' IMPORT CODE,'zssServer','hexToDec' IMPORT CODE,'zssServer','hexdump' IMPORT CODE,'zssServer','httpBackgroundHandler' IMPORT CODE,'zssServer','httpServerSetSessionTokenKey' IMPORT CODE,'zssServer','httpWorkElementHandler' IMPORT CODE,'zssServer','indexOf' IMPORT CODE,'zssServer','indexOfString' IMPORT CODE,'zssServer','indexOfStringInsensitive' IMPORT CODE,'zssServer','initBufferedInput' IMPORT CODE,'zssServer','initChunkedOutput' IMPORT CODE,'zssServer','initWSJsonPrinting' IMPORT CODE,'zssServer','initalizeWebPlugin' IMPORT CODE,'zssServer','isBlanks' IMPORT CODE,'zssServer','isCachedCopyModified' IMPORT CODE,'zssServer','isCharAN' IMPORT CODE,'zssServer','isZeros' IMPORT CODE,'zssServer','jsonAddBoolean' IMPORT CODE,'zssServer','jsonAddInt' IMPORT CODE,'zssServer','jsonAddInt64' IMPORT CODE,'zssServer','jsonAddJSONString' IMPORT CODE,'zssServer','jsonAddLimitedString' IMPORT CODE,'zssServer','jsonAddNull' IMPORT CODE,'zssServer','jsonAddString' IMPORT CODE,'zssServer','jsonAddUInt' IMPORT CODE,'zssServer','jsonAddUnterminatedString' IMPORT CODE,'zssServer','jsonArrayContainsString' IMPORT CODE,'zssServer','jsonArrayGetArray' IMPORT CODE,'zssServer','jsonArrayGetBoolean' IMPORT CODE,'zssServer','jsonArrayGetCount' IMPORT CODE,'zssServer','jsonArrayGetItem' IMPORT CODE,'zssServer','jsonArrayGetNumber' IMPORT CODE,'zssServer','jsonArrayGetObject' IMPORT CODE,'zssServer','jsonArrayGetString' IMPORT CODE,'zssServer','jsonArrayProperty' IMPORT CODE,'zssServer','jsonAsArray' IMPORT CODE,'zssServer','jsonAsBoolean' IMPORT CODE,'zssServer','jsonAsNumber' IMPORT CODE,'zssServer','jsonAsObject' IMPORT CODE,'zssServer','jsonAsString' IMPORT CODE,'zssServer','jsonCheckIOErrorFlag' IMPORT CODE,'zssServer','jsonEnablePrettyPrint' IMPORT CODE,'zssServer','jsonEnd' IMPORT CODE,'zssServer','jsonEndArray' IMPORT CODE,'zssServer','jsonEndObject' IMPORT CODE,'zssServer','jsonIntProperty' IMPORT CODE,'zssServer','jsonIsArray' IMPORT CODE,'zssServer','jsonIsBoolean' IMPORT CODE,'zssServer','jsonIsNull' IMPORT CODE,'zssServer','jsonIsNumber' IMPORT CODE,'zssServer','jsonIsObject' IMPORT CODE,'zssServer','jsonIsString' IMPORT CODE,'zssServer','jsonObjectGetArray' IMPORT CODE,'zssServer','jsonObjectGetBoolean' IMPORT CODE,'zssServer','jsonObjectGetFirstProperty' IMPORT CODE,'zssServer','jsonObjectGetNextProperty' IMPORT CODE,'zssServer','jsonObjectGetNumber' IMPORT CODE,'zssServer','jsonObjectGetObject' IMPORT CODE,'zssServer','jsonObjectGetPropertyValue' IMPORT CODE,'zssServer','jsonObjectGetString' IMPORT CODE,'zssServer','jsonObjectHasKey' IMPORT CODE,'zssServer','jsonObjectProperty' IMPORT CODE,'zssServer','jsonParseFile' IMPORT CODE,'zssServer','jsonParseString' IMPORT CODE,'zssServer','jsonParseUnterminatedString' IMPORT CODE,'zssServer','jsonPrint' IMPORT CODE,'zssServer','jsonPrintArray' IMPORT CODE,'zssServer','jsonPrintObject' IMPORT CODE,'zssServer','jsonPrintProperty' IMPORT CODE,'zssServer','jsonPropertyGetKey' IMPORT CODE,'zssServer','jsonPropertyGetValue' IMPORT CODE,'zssServer','jsonSetIOErrorFlag' IMPORT CODE,'zssServer','jsonStart' IMPORT CODE,'zssServer','jsonStartArray' IMPORT CODE,'zssServer','jsonStartObject' IMPORT CODE,'zssServer','jsonStringProperty' IMPORT CODE,'zssServer','jsonVerifyHomogeneity' IMPORT CODE,'zssServer','lastIndexOf' IMPORT CODE,'zssServer','logConfigureComponent' IMPORT CODE,'zssServer','logConfigureDestination' IMPORT CODE,'zssServer','logConfigureDestination2' IMPORT CODE,'zssServer','logConfigureStandardDestinations' IMPORT CODE,'zssServer','logGetLevel' IMPORT CODE,'zssServer','logSetLevel' IMPORT CODE,'zssServer','logShouldTraceInternal' IMPORT CODE,'zssServer','mainHttpLoop' IMPORT CODE,'zssServer','makeBufferCharStream' IMPORT CODE,'zssServer','makeCustomJsonPrinter' IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' IMPORT CODE,'zssServer','makeFileService' IMPORT CODE,'zssServer','makeGeneratedService' IMPORT CODE,'zssServer','makeHTMLForDirectory' IMPORT CODE,'zssServer','makeHttpConversation' IMPORT CODE,'zssServer','makeHttpDataService' IMPORT CODE,'zssServer','makeHttpDataServiceUrlMask' IMPORT CODE,'zssServer','makeHttpRequestParser' IMPORT CODE,'zssServer','makeHttpResponse' IMPORT CODE,'zssServer','makeHttpServer' IMPORT CODE,'zssServer','makeHttpServer2' IMPORT CODE,'zssServer','makeInt64ParamSpec' IMPORT CODE,'zssServer','makeIntParamSpec' IMPORT CODE,'zssServer','makeJSONForDirectory' IMPORT CODE,'zssServer','makeJsonPrinter' IMPORT CODE,'zssServer','makeLocalLoggingContext' IMPORT CODE,'zssServer','makeLoggingContext' IMPORT CODE,'zssServer','makeMessage' IMPORT CODE,'zssServer','makeParamSpec' IMPORT CODE,'zssServer','makeProxyService' IMPORT CODE,'zssServer','makeShortLivedHeap' IMPORT CODE,'zssServer','makeShortLivedHeap64' IMPORT CODE,'zssServer','makeSimpleTemplateService' IMPORT CODE,'zssServer','makeStringList' IMPORT CODE,'zssServer','makeStringParamSpec' IMPORT CODE,'zssServer','makeUtf8JsonPrinter' IMPORT CODE,'zssServer','makeWSEndpoint' IMPORT CODE,'zssServer','makeWSMessageHandler' IMPORT CODE,'zssServer','makeWSSession' IMPORT CODE,'zssServer','makeWebPlugin' IMPORT CODE,'zssServer','makeWebSocketService' IMPORT CODE,'zssServer','malloc31' IMPORT CODE,'zssServer','matchWithWildcards' IMPORT CODE,'zssServer','noisyMalloc' IMPORT CODE,'zssServer','nullTerminate' IMPORT CODE,'zssServer','openHTMLTemplate' IMPORT CODE,'zssServer','padwspcs' IMPORT CODE,'zssServer','parseInitialInt' IMPORT CODE,'zssServer','parseInt' IMPORT CODE,'zssServer','parseURI' IMPORT CODE,'zssServer','parseURLMask' IMPORT CODE,'zssServer','percentEncode' IMPORT CODE,'zssServer','pluginTypeFromString' IMPORT CODE,'zssServer','pluginTypeString' IMPORT CODE,'zssServer','printStderr' IMPORT CODE,'zssServer','printStdout' IMPORT CODE,'zssServer','processHttpFragment' IMPORT CODE,'zssServer','processServiceRequestParams' IMPORT CODE,'zssServer','pseudoRespond' IMPORT CODE,'zssServer','readByte' IMPORT CODE,'zssServer','recoveryDisableCurrentState' IMPORT CODE,'zssServer','recoveryEnableCurrentState' IMPORT CODE,'zssServer','recoveryEstablishRouter' IMPORT CODE,'zssServer','recoveryGetABENDCode' IMPORT CODE,'zssServer','recoveryIsRouterEstablished' IMPORT CODE,'zssServer','recoveryPop' IMPORT CODE,'zssServer','recoveryPush' IMPORT CODE,'zssServer','recoveryRemoveRouter' IMPORT CODE,'zssServer','recoverySetDumpTitle' IMPORT CODE,'zssServer','recoverySetFlagValue' IMPORT CODE,'zssServer','recoveryUpdateRouterServiceInfo' IMPORT CODE,'zssServer','recoveryUpdateStateServiceInfo' IMPORT CODE,'zssServer','registerHttpServerModuleWithBase' IMPORT CODE,'zssServer','registerHttpService' IMPORT CODE,'zssServer','registerHttpServiceOfLastResort' IMPORT CODE,'zssServer','removeLocalLoggingContext' IMPORT CODE,'zssServer','removeLoggingContext' IMPORT CODE,'zssServer','reportJSONDataProblem' IMPORT CODE,'zssServer','requestIntHeader' IMPORT CODE,'zssServer','requestStringHeader' IMPORT CODE,'zssServer','respondWithChunkedOutputStream' IMPORT CODE,'zssServer','respondWithError' IMPORT CODE,'zssServer','respondWithJsonError' IMPORT CODE,'zssServer','respondWithJsonPrinter' IMPORT CODE,'zssServer','respondWithUnixDirectory' IMPORT CODE,'zssServer','respondWithUnixFileContents' IMPORT CODE,'zssServer','respondWithUnixFileContents2' IMPORT CODE,'zssServer','respondWithUnixFileContentsWithAutocvtMode' IMPORT CODE,'zssServer','respondWithUnixFileNotFound' IMPORT CODE,'zssServer','respondWithXmlPrinter' IMPORT CODE,'zssServer','rpltrmnl' IMPORT CODE,'zssServer','runServiceThread' IMPORT CODE,'zssServer','safeFree' IMPORT CODE,'zssServer','safeFree31' IMPORT CODE,'zssServer','safeFree31Key8' IMPORT CODE,'zssServer','safeFree64' IMPORT CODE,'zssServer','safeFree64ByToken' IMPORT CODE,'zssServer','safeMalloc' IMPORT CODE,'zssServer','safeMalloc2' IMPORT CODE,'zssServer','safeMalloc31' IMPORT CODE,'zssServer','safeMalloc31Key8' IMPORT CODE,'zssServer','safeMalloc64' IMPORT CODE,'zssServer','safeMalloc64ByToken' IMPORT CODE,'zssServer','safeRealloc' IMPORT CODE,'zssServer','serveFile' IMPORT CODE,'zssServer','serveSimpleTemplate' IMPORT CODE,'zssServer','setConfiguredProperty' IMPORT CODE,'zssServer','setContentType' IMPORT CODE,'zssServer','setDefaultJSONRESTHeaders' IMPORT CODE,'zssServer','setHttpAuthTrace' IMPORT CODE,'zssServer','setHttpCloseConversationTrace' IMPORT CODE,'zssServer','setHttpDispatchTrace' IMPORT CODE,'zssServer','setHttpHeadersTrace' IMPORT CODE,'zssServer','setHttpParseTrace' IMPORT CODE,'zssServer','setHttpSocketTrace' IMPORT CODE,'zssServer','setLoggingContext' IMPORT CODE,'zssServer','setResponseStatus' IMPORT CODE,'zssServer','shouldContinueGivenAllowedMethods' IMPORT CODE,'zssServer','simpleHexFill' IMPORT CODE,'zssServer','simpleHexPrint' IMPORT CODE,'zssServer','simpleHexPrintLower' IMPORT CODE,'zssServer','strcopy_safe' IMPORT CODE,'zssServer','streamBinaryForFile' IMPORT CODE,'zssServer','streamTextForFile' IMPORT CODE,'zssServer','streamToSubstitution' IMPORT CODE,'zssServer','stringConcatenate' IMPORT CODE,'zssServer','stringListContains' IMPORT CODE,'zssServer','stringListLast' IMPORT CODE,'zssServer','stringListLength' IMPORT CODE,'zssServer','stringListPrint' IMPORT CODE,'zssServer','strupcase' IMPORT CODE,'zssServer','tknGetAlphanumeric' IMPORT CODE,'zssServer','tknGetDecimal' IMPORT CODE,'zssServer','tknGetNonWhitespace' IMPORT CODE,'zssServer','tknGetQuoted' IMPORT CODE,'zssServer','tknGetStandard' IMPORT CODE,'zssServer','tknGetTerminating' IMPORT CODE,'zssServer','tknInt' IMPORT CODE,'zssServer','tknLength' IMPORT CODE,'zssServer','tknText' IMPORT CODE,'zssServer','tknTextEquals' IMPORT CODE,'zssServer','toASCIIUTF8' IMPORT CODE,'zssServer','upchar' IMPORT CODE,'zssServer','writeBytes' IMPORT CODE,'zssServer','writeFully' IMPORT CODE,'zssServer','writeHeader' IMPORT CODE,'zssServer','writeRequest' IMPORT CODE,'zssServer','writeString' IMPORT CODE,'zssServer','writeTransferChunkHeader' IMPORT CODE,'zssServer','wsSessionMoreInput' IMPORT CODE,'zssServer','zowedump' IMPORT CODE,'zssServer','zowelog' \ No newline at end of file From 891d207f6d251145336862d36bdc93e989b94e65 Mon Sep 17 00:00:00 2001 From: Fyodor Kovin Date: Mon, 6 May 2019 10:12:26 -0400 Subject: [PATCH 3/6] add line breaks Signed-off-by: Fyodor Kovin --- build/gen-side-deck.sh | 6 +- lib/zss.x | 290 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 293 insertions(+), 3 deletions(-) diff --git a/build/gen-side-deck.sh b/build/gen-side-deck.sh index e9a122bdb..7dc6214b1 100755 --- a/build/gen-side-deck.sh +++ b/build/gen-side-deck.sh @@ -1,12 +1,14 @@ #!/bin/bash +trap 'exit 1' ERR + FILES="recovery.o http.o httpserver.o utils.o dataservice.o json.o alloc.o logging.o" cd tmp-zss dd if=zssServer.x conv=unblock cbs=80 of=side-deck nm $FILES |grep ' T ' |awk '{ print $3 }' |sort -u >relevant-functions -cat relevant-functions |while read fn; do grep ",'"$fn"'" side-deck; done > side-deck-filtered +cat relevant-functions |while read fn; do grep ",'"$fn"'" side-deck; done >side-deck-filtered # dd doesn't support file tags, while cat does. -cat side-deck-filtered |dd conv=block cbs=80 bs=80 > zss.x +cat side-deck-filtered |dd conv=block cbs=80 bs=80 |sed 's/\(.\{79\}\)./\1\n/g' >zss.x mkdir -p ../../lib cp zss.x ../../lib echo Side deck ../../lib/zss.x build successfully out of $FILES diff --git a/lib/zss.x b/lib/zss.x index 8d3aa9e6c..9b7f306d0 100644 --- a/lib/zss.x +++ b/lib/zss.x @@ -1 +1,289 @@ - IMPORT CODE,'zssServer','RCVDSECT' IMPORT CODE,'zssServer','SLHAlloc' IMPORT CODE,'zssServer','SLHFree' IMPORT CODE,'zssServer','addHeader' IMPORT CODE,'zssServer','addIntHeader' IMPORT CODE,'zssServer','addStringHeader' IMPORT CODE,'zssServer','addToStringList' IMPORT CODE,'zssServer','addToStringListUnique' IMPORT CODE,'zssServer','allocECSA' IMPORT CODE,'zssServer','asciify' IMPORT CODE,'zssServer','base32Decode' IMPORT CODE,'zssServer','base32Encode' IMPORT CODE,'zssServer','charStreamClose' IMPORT CODE,'zssServer','charStreamEOF' IMPORT CODE,'zssServer','charStreamFree' IMPORT CODE,'zssServer','charStreamGet' IMPORT CODE,'zssServer','charStreamPosition' IMPORT CODE,'zssServer','cleanURLParamValue' IMPORT CODE,'zssServer','closeHTMLTemplate' IMPORT CODE,'zssServer','cnvintst' IMPORT CODE,'zssServer','compareIgnoringCase' IMPORT CODE,'zssServer','compseqs' IMPORT CODE,'zssServer','cons' IMPORT CODE,'zssServer','cons64' IMPORT CODE,'zssServer','convertUnixToISO' IMPORT CODE,'zssServer','copyString' IMPORT CODE,'zssServer','copyStringToNative' IMPORT CODE,'zssServer','decToHex' IMPORT CODE,'zssServer','decimalToOctal' IMPORT CODE,'zssServer','decodeBase64' IMPORT CODE,'zssServer','dequeueHttpRequest' IMPORT CODE,'zssServer','destructivelyNativize' IMPORT CODE,'zssServer','destructivelyUnasciify' IMPORT CODE,'zssServer','dumpBufferToStream' IMPORT CODE,'zssServer','dumpbuffer' IMPORT CODE,'zssServer','dumpbuffer2' IMPORT CODE,'zssServer','dumpbufferA' IMPORT CODE,'zssServer','encodeBase64' IMPORT CODE,'zssServer','extractBasicAuth' IMPORT CODE,'zssServer','finishResponse' IMPORT CODE,'zssServer','firstStringListElt' IMPORT CODE,'zssServer','flushWSJsonPrinting' IMPORT CODE,'zssServer','free31' IMPORT CODE,'zssServer','freeECSA' IMPORT CODE,'zssServer','freeJsonPrinter' IMPORT CODE,'zssServer','freeToken' IMPORT CODE,'zssServer','getCheckedParam' IMPORT CODE,'zssServer','getConfiguredProperty' IMPORT CODE,'zssServer','getHeader' IMPORT CODE,'zssServer','getHeaderLine' IMPORT CODE,'zssServer','getHttpVersion' IMPORT CODE,'zssServer','getLoggingContext' IMPORT CODE,'zssServer','getMimeType' IMPORT CODE,'zssServer','getNextMessage' IMPORT CODE,'zssServer','getQueryParam' IMPORT CODE,'zssServer','getRecoveryContext' IMPORT CODE,'zssServer','getStringToken' IMPORT CODE,'zssServer','hasText' IMPORT CODE,'zssServer','headerMatch' IMPORT CODE,'zssServer','hexFill' IMPORT CODE,'zssServer','hexToDec' IMPORT CODE,'zssServer','hexdump' IMPORT CODE,'zssServer','httpBackgroundHandler' IMPORT CODE,'zssServer','httpServerSetSessionTokenKey' IMPORT CODE,'zssServer','httpWorkElementHandler' IMPORT CODE,'zssServer','indexOf' IMPORT CODE,'zssServer','indexOfString' IMPORT CODE,'zssServer','indexOfStringInsensitive' IMPORT CODE,'zssServer','initBufferedInput' IMPORT CODE,'zssServer','initChunkedOutput' IMPORT CODE,'zssServer','initWSJsonPrinting' IMPORT CODE,'zssServer','initalizeWebPlugin' IMPORT CODE,'zssServer','isBlanks' IMPORT CODE,'zssServer','isCachedCopyModified' IMPORT CODE,'zssServer','isCharAN' IMPORT CODE,'zssServer','isZeros' IMPORT CODE,'zssServer','jsonAddBoolean' IMPORT CODE,'zssServer','jsonAddInt' IMPORT CODE,'zssServer','jsonAddInt64' IMPORT CODE,'zssServer','jsonAddJSONString' IMPORT CODE,'zssServer','jsonAddLimitedString' IMPORT CODE,'zssServer','jsonAddNull' IMPORT CODE,'zssServer','jsonAddString' IMPORT CODE,'zssServer','jsonAddUInt' IMPORT CODE,'zssServer','jsonAddUnterminatedString' IMPORT CODE,'zssServer','jsonArrayContainsString' IMPORT CODE,'zssServer','jsonArrayGetArray' IMPORT CODE,'zssServer','jsonArrayGetBoolean' IMPORT CODE,'zssServer','jsonArrayGetCount' IMPORT CODE,'zssServer','jsonArrayGetItem' IMPORT CODE,'zssServer','jsonArrayGetNumber' IMPORT CODE,'zssServer','jsonArrayGetObject' IMPORT CODE,'zssServer','jsonArrayGetString' IMPORT CODE,'zssServer','jsonArrayProperty' IMPORT CODE,'zssServer','jsonAsArray' IMPORT CODE,'zssServer','jsonAsBoolean' IMPORT CODE,'zssServer','jsonAsNumber' IMPORT CODE,'zssServer','jsonAsObject' IMPORT CODE,'zssServer','jsonAsString' IMPORT CODE,'zssServer','jsonCheckIOErrorFlag' IMPORT CODE,'zssServer','jsonEnablePrettyPrint' IMPORT CODE,'zssServer','jsonEnd' IMPORT CODE,'zssServer','jsonEndArray' IMPORT CODE,'zssServer','jsonEndObject' IMPORT CODE,'zssServer','jsonIntProperty' IMPORT CODE,'zssServer','jsonIsArray' IMPORT CODE,'zssServer','jsonIsBoolean' IMPORT CODE,'zssServer','jsonIsNull' IMPORT CODE,'zssServer','jsonIsNumber' IMPORT CODE,'zssServer','jsonIsObject' IMPORT CODE,'zssServer','jsonIsString' IMPORT CODE,'zssServer','jsonObjectGetArray' IMPORT CODE,'zssServer','jsonObjectGetBoolean' IMPORT CODE,'zssServer','jsonObjectGetFirstProperty' IMPORT CODE,'zssServer','jsonObjectGetNextProperty' IMPORT CODE,'zssServer','jsonObjectGetNumber' IMPORT CODE,'zssServer','jsonObjectGetObject' IMPORT CODE,'zssServer','jsonObjectGetPropertyValue' IMPORT CODE,'zssServer','jsonObjectGetString' IMPORT CODE,'zssServer','jsonObjectHasKey' IMPORT CODE,'zssServer','jsonObjectProperty' IMPORT CODE,'zssServer','jsonParseFile' IMPORT CODE,'zssServer','jsonParseString' IMPORT CODE,'zssServer','jsonParseUnterminatedString' IMPORT CODE,'zssServer','jsonPrint' IMPORT CODE,'zssServer','jsonPrintArray' IMPORT CODE,'zssServer','jsonPrintObject' IMPORT CODE,'zssServer','jsonPrintProperty' IMPORT CODE,'zssServer','jsonPropertyGetKey' IMPORT CODE,'zssServer','jsonPropertyGetValue' IMPORT CODE,'zssServer','jsonSetIOErrorFlag' IMPORT CODE,'zssServer','jsonStart' IMPORT CODE,'zssServer','jsonStartArray' IMPORT CODE,'zssServer','jsonStartObject' IMPORT CODE,'zssServer','jsonStringProperty' IMPORT CODE,'zssServer','jsonVerifyHomogeneity' IMPORT CODE,'zssServer','lastIndexOf' IMPORT CODE,'zssServer','logConfigureComponent' IMPORT CODE,'zssServer','logConfigureDestination' IMPORT CODE,'zssServer','logConfigureDestination2' IMPORT CODE,'zssServer','logConfigureStandardDestinations' IMPORT CODE,'zssServer','logGetLevel' IMPORT CODE,'zssServer','logSetLevel' IMPORT CODE,'zssServer','logShouldTraceInternal' IMPORT CODE,'zssServer','mainHttpLoop' IMPORT CODE,'zssServer','makeBufferCharStream' IMPORT CODE,'zssServer','makeCustomJsonPrinter' IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' IMPORT CODE,'zssServer','makeFileService' IMPORT CODE,'zssServer','makeGeneratedService' IMPORT CODE,'zssServer','makeHTMLForDirectory' IMPORT CODE,'zssServer','makeHttpConversation' IMPORT CODE,'zssServer','makeHttpDataService' IMPORT CODE,'zssServer','makeHttpDataServiceUrlMask' IMPORT CODE,'zssServer','makeHttpRequestParser' IMPORT CODE,'zssServer','makeHttpResponse' IMPORT CODE,'zssServer','makeHttpServer' IMPORT CODE,'zssServer','makeHttpServer2' IMPORT CODE,'zssServer','makeInt64ParamSpec' IMPORT CODE,'zssServer','makeIntParamSpec' IMPORT CODE,'zssServer','makeJSONForDirectory' IMPORT CODE,'zssServer','makeJsonPrinter' IMPORT CODE,'zssServer','makeLocalLoggingContext' IMPORT CODE,'zssServer','makeLoggingContext' IMPORT CODE,'zssServer','makeMessage' IMPORT CODE,'zssServer','makeParamSpec' IMPORT CODE,'zssServer','makeProxyService' IMPORT CODE,'zssServer','makeShortLivedHeap' IMPORT CODE,'zssServer','makeShortLivedHeap64' IMPORT CODE,'zssServer','makeSimpleTemplateService' IMPORT CODE,'zssServer','makeStringList' IMPORT CODE,'zssServer','makeStringParamSpec' IMPORT CODE,'zssServer','makeUtf8JsonPrinter' IMPORT CODE,'zssServer','makeWSEndpoint' IMPORT CODE,'zssServer','makeWSMessageHandler' IMPORT CODE,'zssServer','makeWSSession' IMPORT CODE,'zssServer','makeWebPlugin' IMPORT CODE,'zssServer','makeWebSocketService' IMPORT CODE,'zssServer','malloc31' IMPORT CODE,'zssServer','matchWithWildcards' IMPORT CODE,'zssServer','noisyMalloc' IMPORT CODE,'zssServer','nullTerminate' IMPORT CODE,'zssServer','openHTMLTemplate' IMPORT CODE,'zssServer','padwspcs' IMPORT CODE,'zssServer','parseInitialInt' IMPORT CODE,'zssServer','parseInt' IMPORT CODE,'zssServer','parseURI' IMPORT CODE,'zssServer','parseURLMask' IMPORT CODE,'zssServer','percentEncode' IMPORT CODE,'zssServer','pluginTypeFromString' IMPORT CODE,'zssServer','pluginTypeString' IMPORT CODE,'zssServer','printStderr' IMPORT CODE,'zssServer','printStdout' IMPORT CODE,'zssServer','processHttpFragment' IMPORT CODE,'zssServer','processServiceRequestParams' IMPORT CODE,'zssServer','pseudoRespond' IMPORT CODE,'zssServer','readByte' IMPORT CODE,'zssServer','recoveryDisableCurrentState' IMPORT CODE,'zssServer','recoveryEnableCurrentState' IMPORT CODE,'zssServer','recoveryEstablishRouter' IMPORT CODE,'zssServer','recoveryGetABENDCode' IMPORT CODE,'zssServer','recoveryIsRouterEstablished' IMPORT CODE,'zssServer','recoveryPop' IMPORT CODE,'zssServer','recoveryPush' IMPORT CODE,'zssServer','recoveryRemoveRouter' IMPORT CODE,'zssServer','recoverySetDumpTitle' IMPORT CODE,'zssServer','recoverySetFlagValue' IMPORT CODE,'zssServer','recoveryUpdateRouterServiceInfo' IMPORT CODE,'zssServer','recoveryUpdateStateServiceInfo' IMPORT CODE,'zssServer','registerHttpServerModuleWithBase' IMPORT CODE,'zssServer','registerHttpService' IMPORT CODE,'zssServer','registerHttpServiceOfLastResort' IMPORT CODE,'zssServer','removeLocalLoggingContext' IMPORT CODE,'zssServer','removeLoggingContext' IMPORT CODE,'zssServer','reportJSONDataProblem' IMPORT CODE,'zssServer','requestIntHeader' IMPORT CODE,'zssServer','requestStringHeader' IMPORT CODE,'zssServer','respondWithChunkedOutputStream' IMPORT CODE,'zssServer','respondWithError' IMPORT CODE,'zssServer','respondWithJsonError' IMPORT CODE,'zssServer','respondWithJsonPrinter' IMPORT CODE,'zssServer','respondWithUnixDirectory' IMPORT CODE,'zssServer','respondWithUnixFileContents' IMPORT CODE,'zssServer','respondWithUnixFileContents2' IMPORT CODE,'zssServer','respondWithUnixFileContentsWithAutocvtMode' IMPORT CODE,'zssServer','respondWithUnixFileNotFound' IMPORT CODE,'zssServer','respondWithXmlPrinter' IMPORT CODE,'zssServer','rpltrmnl' IMPORT CODE,'zssServer','runServiceThread' IMPORT CODE,'zssServer','safeFree' IMPORT CODE,'zssServer','safeFree31' IMPORT CODE,'zssServer','safeFree31Key8' IMPORT CODE,'zssServer','safeFree64' IMPORT CODE,'zssServer','safeFree64ByToken' IMPORT CODE,'zssServer','safeMalloc' IMPORT CODE,'zssServer','safeMalloc2' IMPORT CODE,'zssServer','safeMalloc31' IMPORT CODE,'zssServer','safeMalloc31Key8' IMPORT CODE,'zssServer','safeMalloc64' IMPORT CODE,'zssServer','safeMalloc64ByToken' IMPORT CODE,'zssServer','safeRealloc' IMPORT CODE,'zssServer','serveFile' IMPORT CODE,'zssServer','serveSimpleTemplate' IMPORT CODE,'zssServer','setConfiguredProperty' IMPORT CODE,'zssServer','setContentType' IMPORT CODE,'zssServer','setDefaultJSONRESTHeaders' IMPORT CODE,'zssServer','setHttpAuthTrace' IMPORT CODE,'zssServer','setHttpCloseConversationTrace' IMPORT CODE,'zssServer','setHttpDispatchTrace' IMPORT CODE,'zssServer','setHttpHeadersTrace' IMPORT CODE,'zssServer','setHttpParseTrace' IMPORT CODE,'zssServer','setHttpSocketTrace' IMPORT CODE,'zssServer','setLoggingContext' IMPORT CODE,'zssServer','setResponseStatus' IMPORT CODE,'zssServer','shouldContinueGivenAllowedMethods' IMPORT CODE,'zssServer','simpleHexFill' IMPORT CODE,'zssServer','simpleHexPrint' IMPORT CODE,'zssServer','simpleHexPrintLower' IMPORT CODE,'zssServer','strcopy_safe' IMPORT CODE,'zssServer','streamBinaryForFile' IMPORT CODE,'zssServer','streamTextForFile' IMPORT CODE,'zssServer','streamToSubstitution' IMPORT CODE,'zssServer','stringConcatenate' IMPORT CODE,'zssServer','stringListContains' IMPORT CODE,'zssServer','stringListLast' IMPORT CODE,'zssServer','stringListLength' IMPORT CODE,'zssServer','stringListPrint' IMPORT CODE,'zssServer','strupcase' IMPORT CODE,'zssServer','tknGetAlphanumeric' IMPORT CODE,'zssServer','tknGetDecimal' IMPORT CODE,'zssServer','tknGetNonWhitespace' IMPORT CODE,'zssServer','tknGetQuoted' IMPORT CODE,'zssServer','tknGetStandard' IMPORT CODE,'zssServer','tknGetTerminating' IMPORT CODE,'zssServer','tknInt' IMPORT CODE,'zssServer','tknLength' IMPORT CODE,'zssServer','tknText' IMPORT CODE,'zssServer','tknTextEquals' IMPORT CODE,'zssServer','toASCIIUTF8' IMPORT CODE,'zssServer','upchar' IMPORT CODE,'zssServer','writeBytes' IMPORT CODE,'zssServer','writeFully' IMPORT CODE,'zssServer','writeHeader' IMPORT CODE,'zssServer','writeRequest' IMPORT CODE,'zssServer','writeString' IMPORT CODE,'zssServer','writeTransferChunkHeader' IMPORT CODE,'zssServer','wsSessionMoreInput' IMPORT CODE,'zssServer','zowedump' IMPORT CODE,'zssServer','zowelog' \ No newline at end of file + IMPORT CODE,'zssServer','RCVDSECT' + IMPORT CODE,'zssServer','SLHAlloc' + IMPORT CODE,'zssServer','SLHFree' + IMPORT CODE,'zssServer','addHeader' + IMPORT CODE,'zssServer','addIntHeader' + IMPORT CODE,'zssServer','addStringHeader' + IMPORT CODE,'zssServer','addToStringList' + IMPORT CODE,'zssServer','addToStringListUnique' + IMPORT CODE,'zssServer','allocECSA' + IMPORT CODE,'zssServer','asciify' + IMPORT CODE,'zssServer','base32Decode' + IMPORT CODE,'zssServer','base32Encode' + IMPORT CODE,'zssServer','charStreamClose' + IMPORT CODE,'zssServer','charStreamEOF' + IMPORT CODE,'zssServer','charStreamFree' + IMPORT CODE,'zssServer','charStreamGet' + IMPORT CODE,'zssServer','charStreamPosition' + IMPORT CODE,'zssServer','cleanURLParamValue' + IMPORT CODE,'zssServer','closeHTMLTemplate' + IMPORT CODE,'zssServer','cnvintst' + IMPORT CODE,'zssServer','compareIgnoringCase' + IMPORT CODE,'zssServer','compseqs' + IMPORT CODE,'zssServer','cons' + IMPORT CODE,'zssServer','cons64' + IMPORT CODE,'zssServer','convertUnixToISO' + IMPORT CODE,'zssServer','copyString' + IMPORT CODE,'zssServer','copyStringToNative' + IMPORT CODE,'zssServer','decToHex' + IMPORT CODE,'zssServer','decimalToOctal' + IMPORT CODE,'zssServer','decodeBase64' + IMPORT CODE,'zssServer','dequeueHttpRequest' + IMPORT CODE,'zssServer','destructivelyNativize' + IMPORT CODE,'zssServer','destructivelyUnasciify' + IMPORT CODE,'zssServer','dumpBufferToStream' + IMPORT CODE,'zssServer','dumpbuffer' + IMPORT CODE,'zssServer','dumpbuffer2' + IMPORT CODE,'zssServer','dumpbufferA' + IMPORT CODE,'zssServer','encodeBase64' + IMPORT CODE,'zssServer','extractBasicAuth' + IMPORT CODE,'zssServer','finishResponse' + IMPORT CODE,'zssServer','firstStringListElt' + IMPORT CODE,'zssServer','flushWSJsonPrinting' + IMPORT CODE,'zssServer','free31' + IMPORT CODE,'zssServer','freeECSA' + IMPORT CODE,'zssServer','freeJsonPrinter' + IMPORT CODE,'zssServer','freeToken' + IMPORT CODE,'zssServer','getCheckedParam' + IMPORT CODE,'zssServer','getConfiguredProperty' + IMPORT CODE,'zssServer','getHeader' + IMPORT CODE,'zssServer','getHeaderLine' + IMPORT CODE,'zssServer','getHttpVersion' + IMPORT CODE,'zssServer','getLoggingContext' + IMPORT CODE,'zssServer','getMimeType' + IMPORT CODE,'zssServer','getNextMessage' + IMPORT CODE,'zssServer','getQueryParam' + IMPORT CODE,'zssServer','getRecoveryContext' + IMPORT CODE,'zssServer','getStringToken' + IMPORT CODE,'zssServer','hasText' + IMPORT CODE,'zssServer','headerMatch' + IMPORT CODE,'zssServer','hexFill' + IMPORT CODE,'zssServer','hexToDec' + IMPORT CODE,'zssServer','hexdump' + IMPORT CODE,'zssServer','httpBackgroundHandler' + IMPORT CODE,'zssServer','httpServerSetSessionTokenKey' + IMPORT CODE,'zssServer','httpWorkElementHandler' + IMPORT CODE,'zssServer','indexOf' + IMPORT CODE,'zssServer','indexOfString' + IMPORT CODE,'zssServer','indexOfStringInsensitive' + IMPORT CODE,'zssServer','initBufferedInput' + IMPORT CODE,'zssServer','initChunkedOutput' + IMPORT CODE,'zssServer','initWSJsonPrinting' + IMPORT CODE,'zssServer','initalizeWebPlugin' + IMPORT CODE,'zssServer','isBlanks' + IMPORT CODE,'zssServer','isCachedCopyModified' + IMPORT CODE,'zssServer','isCharAN' + IMPORT CODE,'zssServer','isZeros' + IMPORT CODE,'zssServer','jsonAddBoolean' + IMPORT CODE,'zssServer','jsonAddInt' + IMPORT CODE,'zssServer','jsonAddInt64' + IMPORT CODE,'zssServer','jsonAddJSONString' + IMPORT CODE,'zssServer','jsonAddLimitedString' + IMPORT CODE,'zssServer','jsonAddNull' + IMPORT CODE,'zssServer','jsonAddString' + IMPORT CODE,'zssServer','jsonAddUInt' + IMPORT CODE,'zssServer','jsonAddUnterminatedString' + IMPORT CODE,'zssServer','jsonArrayContainsString' + IMPORT CODE,'zssServer','jsonArrayGetArray' + IMPORT CODE,'zssServer','jsonArrayGetBoolean' + IMPORT CODE,'zssServer','jsonArrayGetCount' + IMPORT CODE,'zssServer','jsonArrayGetItem' + IMPORT CODE,'zssServer','jsonArrayGetNumber' + IMPORT CODE,'zssServer','jsonArrayGetObject' + IMPORT CODE,'zssServer','jsonArrayGetString' + IMPORT CODE,'zssServer','jsonArrayProperty' + IMPORT CODE,'zssServer','jsonAsArray' + IMPORT CODE,'zssServer','jsonAsBoolean' + IMPORT CODE,'zssServer','jsonAsNumber' + IMPORT CODE,'zssServer','jsonAsObject' + IMPORT CODE,'zssServer','jsonAsString' + IMPORT CODE,'zssServer','jsonCheckIOErrorFlag' + IMPORT CODE,'zssServer','jsonEnablePrettyPrint' + IMPORT CODE,'zssServer','jsonEnd' + IMPORT CODE,'zssServer','jsonEndArray' + IMPORT CODE,'zssServer','jsonEndObject' + IMPORT CODE,'zssServer','jsonIntProperty' + IMPORT CODE,'zssServer','jsonIsArray' + IMPORT CODE,'zssServer','jsonIsBoolean' + IMPORT CODE,'zssServer','jsonIsNull' + IMPORT CODE,'zssServer','jsonIsNumber' + IMPORT CODE,'zssServer','jsonIsObject' + IMPORT CODE,'zssServer','jsonIsString' + IMPORT CODE,'zssServer','jsonObjectGetArray' + IMPORT CODE,'zssServer','jsonObjectGetBoolean' + IMPORT CODE,'zssServer','jsonObjectGetFirstProperty' + IMPORT CODE,'zssServer','jsonObjectGetNextProperty' + IMPORT CODE,'zssServer','jsonObjectGetNumber' + IMPORT CODE,'zssServer','jsonObjectGetObject' + IMPORT CODE,'zssServer','jsonObjectGetPropertyValue' + IMPORT CODE,'zssServer','jsonObjectGetString' + IMPORT CODE,'zssServer','jsonObjectHasKey' + IMPORT CODE,'zssServer','jsonObjectProperty' + IMPORT CODE,'zssServer','jsonParseFile' + IMPORT CODE,'zssServer','jsonParseString' + IMPORT CODE,'zssServer','jsonParseUnterminatedString' + IMPORT CODE,'zssServer','jsonPrint' + IMPORT CODE,'zssServer','jsonPrintArray' + IMPORT CODE,'zssServer','jsonPrintObject' + IMPORT CODE,'zssServer','jsonPrintProperty' + IMPORT CODE,'zssServer','jsonPropertyGetKey' + IMPORT CODE,'zssServer','jsonPropertyGetValue' + IMPORT CODE,'zssServer','jsonSetIOErrorFlag' + IMPORT CODE,'zssServer','jsonStart' + IMPORT CODE,'zssServer','jsonStartArray' + IMPORT CODE,'zssServer','jsonStartObject' + IMPORT CODE,'zssServer','jsonStringProperty' + IMPORT CODE,'zssServer','jsonVerifyHomogeneity' + IMPORT CODE,'zssServer','lastIndexOf' + IMPORT CODE,'zssServer','logConfigureComponent' + IMPORT CODE,'zssServer','logConfigureDestination' + IMPORT CODE,'zssServer','logConfigureDestination2' + IMPORT CODE,'zssServer','logConfigureStandardDestinations' + IMPORT CODE,'zssServer','logGetLevel' + IMPORT CODE,'zssServer','logSetLevel' + IMPORT CODE,'zssServer','logShouldTraceInternal' + IMPORT CODE,'zssServer','mainHttpLoop' + IMPORT CODE,'zssServer','makeBufferCharStream' + IMPORT CODE,'zssServer','makeCustomJsonPrinter' + IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' + IMPORT CODE,'zssServer','makeFileService' + IMPORT CODE,'zssServer','makeGeneratedService' + IMPORT CODE,'zssServer','makeHTMLForDirectory' + IMPORT CODE,'zssServer','makeHttpConversation' + IMPORT CODE,'zssServer','makeHttpDataService' + IMPORT CODE,'zssServer','makeHttpDataServiceUrlMask' + IMPORT CODE,'zssServer','makeHttpRequestParser' + IMPORT CODE,'zssServer','makeHttpResponse' + IMPORT CODE,'zssServer','makeHttpServer' + IMPORT CODE,'zssServer','makeHttpServer2' + IMPORT CODE,'zssServer','makeInt64ParamSpec' + IMPORT CODE,'zssServer','makeIntParamSpec' + IMPORT CODE,'zssServer','makeJSONForDirectory' + IMPORT CODE,'zssServer','makeJsonPrinter' + IMPORT CODE,'zssServer','makeLocalLoggingContext' + IMPORT CODE,'zssServer','makeLoggingContext' + IMPORT CODE,'zssServer','makeMessage' + IMPORT CODE,'zssServer','makeParamSpec' + IMPORT CODE,'zssServer','makeProxyService' + IMPORT CODE,'zssServer','makeShortLivedHeap' + IMPORT CODE,'zssServer','makeShortLivedHeap64' + IMPORT CODE,'zssServer','makeSimpleTemplateService' + IMPORT CODE,'zssServer','makeStringList' + IMPORT CODE,'zssServer','makeStringParamSpec' + IMPORT CODE,'zssServer','makeUtf8JsonPrinter' + IMPORT CODE,'zssServer','makeWSEndpoint' + IMPORT CODE,'zssServer','makeWSMessageHandler' + IMPORT CODE,'zssServer','makeWSSession' + IMPORT CODE,'zssServer','makeWebPlugin' + IMPORT CODE,'zssServer','makeWebSocketService' + IMPORT CODE,'zssServer','malloc31' + IMPORT CODE,'zssServer','matchWithWildcards' + IMPORT CODE,'zssServer','noisyMalloc' + IMPORT CODE,'zssServer','nullTerminate' + IMPORT CODE,'zssServer','openHTMLTemplate' + IMPORT CODE,'zssServer','padwspcs' + IMPORT CODE,'zssServer','parseInitialInt' + IMPORT CODE,'zssServer','parseInt' + IMPORT CODE,'zssServer','parseURI' + IMPORT CODE,'zssServer','parseURLMask' + IMPORT CODE,'zssServer','percentEncode' + IMPORT CODE,'zssServer','pluginTypeFromString' + IMPORT CODE,'zssServer','pluginTypeString' + IMPORT CODE,'zssServer','printStderr' + IMPORT CODE,'zssServer','printStdout' + IMPORT CODE,'zssServer','processHttpFragment' + IMPORT CODE,'zssServer','processServiceRequestParams' + IMPORT CODE,'zssServer','pseudoRespond' + IMPORT CODE,'zssServer','readByte' + IMPORT CODE,'zssServer','recoveryDisableCurrentState' + IMPORT CODE,'zssServer','recoveryEnableCurrentState' + IMPORT CODE,'zssServer','recoveryEstablishRouter' + IMPORT CODE,'zssServer','recoveryGetABENDCode' + IMPORT CODE,'zssServer','recoveryIsRouterEstablished' + IMPORT CODE,'zssServer','recoveryPop' + IMPORT CODE,'zssServer','recoveryPush' + IMPORT CODE,'zssServer','recoveryRemoveRouter' + IMPORT CODE,'zssServer','recoverySetDumpTitle' + IMPORT CODE,'zssServer','recoverySetFlagValue' + IMPORT CODE,'zssServer','recoveryUpdateRouterServiceInfo' + IMPORT CODE,'zssServer','recoveryUpdateStateServiceInfo' + IMPORT CODE,'zssServer','registerHttpServerModuleWithBase' + IMPORT CODE,'zssServer','registerHttpService' + IMPORT CODE,'zssServer','registerHttpServiceOfLastResort' + IMPORT CODE,'zssServer','removeLocalLoggingContext' + IMPORT CODE,'zssServer','removeLoggingContext' + IMPORT CODE,'zssServer','reportJSONDataProblem' + IMPORT CODE,'zssServer','requestIntHeader' + IMPORT CODE,'zssServer','requestStringHeader' + IMPORT CODE,'zssServer','respondWithChunkedOutputStream' + IMPORT CODE,'zssServer','respondWithError' + IMPORT CODE,'zssServer','respondWithJsonError' + IMPORT CODE,'zssServer','respondWithJsonPrinter' + IMPORT CODE,'zssServer','respondWithUnixDirectory' + IMPORT CODE,'zssServer','respondWithUnixFileContents' + IMPORT CODE,'zssServer','respondWithUnixFileContents2' + IMPORT CODE,'zssServer','respondWithUnixFileContentsWithAutocvtMode' + IMPORT CODE,'zssServer','respondWithUnixFileNotFound' + IMPORT CODE,'zssServer','respondWithXmlPrinter' + IMPORT CODE,'zssServer','rpltrmnl' + IMPORT CODE,'zssServer','runServiceThread' + IMPORT CODE,'zssServer','safeFree' + IMPORT CODE,'zssServer','safeFree31' + IMPORT CODE,'zssServer','safeFree31Key8' + IMPORT CODE,'zssServer','safeFree64' + IMPORT CODE,'zssServer','safeFree64ByToken' + IMPORT CODE,'zssServer','safeMalloc' + IMPORT CODE,'zssServer','safeMalloc2' + IMPORT CODE,'zssServer','safeMalloc31' + IMPORT CODE,'zssServer','safeMalloc31Key8' + IMPORT CODE,'zssServer','safeMalloc64' + IMPORT CODE,'zssServer','safeMalloc64ByToken' + IMPORT CODE,'zssServer','safeRealloc' + IMPORT CODE,'zssServer','serveFile' + IMPORT CODE,'zssServer','serveSimpleTemplate' + IMPORT CODE,'zssServer','setConfiguredProperty' + IMPORT CODE,'zssServer','setContentType' + IMPORT CODE,'zssServer','setDefaultJSONRESTHeaders' + IMPORT CODE,'zssServer','setHttpAuthTrace' + IMPORT CODE,'zssServer','setHttpCloseConversationTrace' + IMPORT CODE,'zssServer','setHttpDispatchTrace' + IMPORT CODE,'zssServer','setHttpHeadersTrace' + IMPORT CODE,'zssServer','setHttpParseTrace' + IMPORT CODE,'zssServer','setHttpSocketTrace' + IMPORT CODE,'zssServer','setLoggingContext' + IMPORT CODE,'zssServer','setResponseStatus' + IMPORT CODE,'zssServer','shouldContinueGivenAllowedMethods' + IMPORT CODE,'zssServer','simpleHexFill' + IMPORT CODE,'zssServer','simpleHexPrint' + IMPORT CODE,'zssServer','simpleHexPrintLower' + IMPORT CODE,'zssServer','strcopy_safe' + IMPORT CODE,'zssServer','streamBinaryForFile' + IMPORT CODE,'zssServer','streamTextForFile' + IMPORT CODE,'zssServer','streamToSubstitution' + IMPORT CODE,'zssServer','stringConcatenate' + IMPORT CODE,'zssServer','stringListContains' + IMPORT CODE,'zssServer','stringListLast' + IMPORT CODE,'zssServer','stringListLength' + IMPORT CODE,'zssServer','stringListPrint' + IMPORT CODE,'zssServer','strupcase' + IMPORT CODE,'zssServer','tknGetAlphanumeric' + IMPORT CODE,'zssServer','tknGetDecimal' + IMPORT CODE,'zssServer','tknGetNonWhitespace' + IMPORT CODE,'zssServer','tknGetQuoted' + IMPORT CODE,'zssServer','tknGetStandard' + IMPORT CODE,'zssServer','tknGetTerminating' + IMPORT CODE,'zssServer','tknInt' + IMPORT CODE,'zssServer','tknLength' + IMPORT CODE,'zssServer','tknText' + IMPORT CODE,'zssServer','tknTextEquals' + IMPORT CODE,'zssServer','toASCIIUTF8' + IMPORT CODE,'zssServer','upchar' + IMPORT CODE,'zssServer','writeBytes' + IMPORT CODE,'zssServer','writeFully' + IMPORT CODE,'zssServer','writeHeader' + IMPORT CODE,'zssServer','writeRequest' + IMPORT CODE,'zssServer','writeString' + IMPORT CODE,'zssServer','writeTransferChunkHeader' + IMPORT CODE,'zssServer','wsSessionMoreInput' + IMPORT CODE,'zssServer','zowedump' + IMPORT CODE,'zssServer','zowelog' From 4f5cd0e1c49136fc8e7c5d25ff857333849eee95 Mon Sep 17 00:00:00 2001 From: Fyodor Kovin Date: Mon, 6 May 2019 12:44:33 -0400 Subject: [PATCH 4/6] adjust the bl/wl Signed-off-by: Fyodor Kovin --- build/gen-side-deck.sh | 36 ++++++-- build/side-deck-defs/files | 3 + build/side-deck-defs/httpserver.o-bl | 10 +++ build/side-deck-defs/utils.o-wl | 19 ++++ lib/zss.x | 127 ++++++++++----------------- 5 files changed, 109 insertions(+), 86 deletions(-) create mode 100644 build/side-deck-defs/files create mode 100644 build/side-deck-defs/httpserver.o-bl create mode 100644 build/side-deck-defs/utils.o-wl diff --git a/build/gen-side-deck.sh b/build/gen-side-deck.sh index 7dc6214b1..b27d8f750 100755 --- a/build/gen-side-deck.sh +++ b/build/gen-side-deck.sh @@ -1,17 +1,41 @@ #!/bin/bash trap 'exit 1' ERR -FILES="recovery.o http.o httpserver.o utils.o dataservice.o json.o alloc.o logging.o" +ZSS=${ZSS:-$PWD/..} + +DEFS=$ZSS/build/side-deck-defs +FILES="`cat $DEFS/files`" + +cd $ZSS/build/tmp-zss -cd tmp-zss dd if=zssServer.x conv=unblock cbs=80 of=side-deck -nm $FILES |grep ' T ' |awk '{ print $3 }' |sort -u >relevant-functions + +rm -f relevant-functions +for f in $FILES +do + if [ -f $DEFS/$f-bl ] + then + echo "Found blacklist file for $f" + nm $f |grep ' T ' |awk '{ print $3 }' |grep -v -f $DEFS/$f-bl >>relevant-functions + elif [ -f $DEFS/$f-wl ] + then + echo "Found whilelist file for $f" + nm $f |grep ' T ' |awk '{ print $3 }' |grep -f $DEFS/$f-wl >>relevant-functions + else + echo "Adding all functions from $f to the side deck" + nm $f |grep ' T ' |awk '{ print $3 }' >>relevant-functions + fi +done +sort -u -o relevant-functions relevant-functions + cat relevant-functions |while read fn; do grep ",'"$fn"'" side-deck; done >side-deck-filtered + # dd doesn't support file tags, while cat does. cat side-deck-filtered |dd conv=block cbs=80 bs=80 |sed 's/\(.\{79\}\)./\1\n/g' >zss.x -mkdir -p ../../lib -cp zss.x ../../lib -echo Side deck ../../lib/zss.x build successfully out of $FILES + +mkdir -p $ZSS/lib +cp zss.x $ZSS/lib +echo Side deck $ZSS/lib/zss.x build successfully out of $FILES diff --git a/build/side-deck-defs/files b/build/side-deck-defs/files new file mode 100644 index 000000000..916a4eac1 --- /dev/null +++ b/build/side-deck-defs/files @@ -0,0 +1,3 @@ +recovery.o http.o httpserver.o utils.o +dataservice.o json.o xml.o logging.o + diff --git a/build/side-deck-defs/httpserver.o-bl b/build/side-deck-defs/httpserver.o-bl new file mode 100644 index 000000000..7f6fb637a --- /dev/null +++ b/build/side-deck-defs/httpserver.o-bl @@ -0,0 +1,10 @@ +registerHttpServerModuleWithBase +httpServerSetSessionTokenKey +registerHttpService +dequeueHttpRequest +makeHttpRequestParser +makeHttpResponse +makeHttpServer2 +makeHttpServer +makeSecureHttpServer +makeHttpConversation diff --git a/build/side-deck-defs/utils.o-wl b/build/side-deck-defs/utils.o-wl new file mode 100644 index 000000000..43fe90e96 --- /dev/null +++ b/build/side-deck-defs/utils.o-wl @@ -0,0 +1,19 @@ +addToStringList +addToStringList +addToStringListUnique +firstStringListElt +makeStringList +stringListContains +stringListContains +stringListLast +stringListLength +stringListPrint +SLHAlloc +SLHAlloc +SLHFree +makeShortLivedHeap +makeShortLivedHeap64 +destructivelyUnasciify +nullTerminate +dumpbuffer +cnvintst diff --git a/lib/zss.x b/lib/zss.x index 9b7f306d0..27c687c2d 100644 --- a/lib/zss.x +++ b/lib/zss.x @@ -1,49 +1,33 @@ IMPORT CODE,'zssServer','RCVDSECT' IMPORT CODE,'zssServer','SLHAlloc' IMPORT CODE,'zssServer','SLHFree' + IMPORT CODE,'zssServer','addAttribute' + IMPORT CODE,'zssServer','addChild' IMPORT CODE,'zssServer','addHeader' IMPORT CODE,'zssServer','addIntHeader' IMPORT CODE,'zssServer','addStringHeader' IMPORT CODE,'zssServer','addToStringList' IMPORT CODE,'zssServer','addToStringListUnique' - IMPORT CODE,'zssServer','allocECSA' IMPORT CODE,'zssServer','asciify' - IMPORT CODE,'zssServer','base32Decode' - IMPORT CODE,'zssServer','base32Encode' - IMPORT CODE,'zssServer','charStreamClose' - IMPORT CODE,'zssServer','charStreamEOF' - IMPORT CODE,'zssServer','charStreamFree' - IMPORT CODE,'zssServer','charStreamGet' - IMPORT CODE,'zssServer','charStreamPosition' - IMPORT CODE,'zssServer','cleanURLParamValue' IMPORT CODE,'zssServer','closeHTMLTemplate' IMPORT CODE,'zssServer','cnvintst' - IMPORT CODE,'zssServer','compareIgnoringCase' - IMPORT CODE,'zssServer','compseqs' - IMPORT CODE,'zssServer','cons' - IMPORT CODE,'zssServer','cons64' - IMPORT CODE,'zssServer','convertUnixToISO' IMPORT CODE,'zssServer','copyString' IMPORT CODE,'zssServer','copyStringToNative' - IMPORT CODE,'zssServer','decToHex' - IMPORT CODE,'zssServer','decimalToOctal' - IMPORT CODE,'zssServer','decodeBase64' - IMPORT CODE,'zssServer','dequeueHttpRequest' IMPORT CODE,'zssServer','destructivelyNativize' IMPORT CODE,'zssServer','destructivelyUnasciify' - IMPORT CODE,'zssServer','dumpBufferToStream' IMPORT CODE,'zssServer','dumpbuffer' IMPORT CODE,'zssServer','dumpbuffer2' IMPORT CODE,'zssServer','dumpbufferA' - IMPORT CODE,'zssServer','encodeBase64' IMPORT CODE,'zssServer','extractBasicAuth' IMPORT CODE,'zssServer','finishResponse' + IMPORT CODE,'zssServer','firstChildWithTag' + IMPORT CODE,'zssServer','firstRealChild' IMPORT CODE,'zssServer','firstStringListElt' IMPORT CODE,'zssServer','flushWSJsonPrinting' - IMPORT CODE,'zssServer','free31' - IMPORT CODE,'zssServer','freeECSA' IMPORT CODE,'zssServer','freeJsonPrinter' - IMPORT CODE,'zssServer','freeToken' + IMPORT CODE,'zssServer','freeXmlParser' + IMPORT CODE,'zssServer','getAttribute' + IMPORT CODE,'zssServer','getBooleanAttribute' IMPORT CODE,'zssServer','getCheckedParam' IMPORT CODE,'zssServer','getConfiguredProperty' IMPORT CODE,'zssServer','getHeader' @@ -55,25 +39,18 @@ IMPORT CODE,'zssServer','getQueryParam' IMPORT CODE,'zssServer','getRecoveryContext' IMPORT CODE,'zssServer','getStringToken' - IMPORT CODE,'zssServer','hasText' + IMPORT CODE,'zssServer','getSwitch' + IMPORT CODE,'zssServer','getTokenNoWS' + IMPORT CODE,'zssServer','getXMLToken' IMPORT CODE,'zssServer','headerMatch' - IMPORT CODE,'zssServer','hexFill' - IMPORT CODE,'zssServer','hexToDec' - IMPORT CODE,'zssServer','hexdump' IMPORT CODE,'zssServer','httpBackgroundHandler' - IMPORT CODE,'zssServer','httpServerSetSessionTokenKey' IMPORT CODE,'zssServer','httpWorkElementHandler' - IMPORT CODE,'zssServer','indexOf' - IMPORT CODE,'zssServer','indexOfString' - IMPORT CODE,'zssServer','indexOfStringInsensitive' IMPORT CODE,'zssServer','initBufferedInput' IMPORT CODE,'zssServer','initChunkedOutput' IMPORT CODE,'zssServer','initWSJsonPrinting' IMPORT CODE,'zssServer','initalizeWebPlugin' - IMPORT CODE,'zssServer','isBlanks' + IMPORT CODE,'zssServer','intFromChildWithTag' IMPORT CODE,'zssServer','isCachedCopyModified' - IMPORT CODE,'zssServer','isCharAN' - IMPORT CODE,'zssServer','isZeros' IMPORT CODE,'zssServer','jsonAddBoolean' IMPORT CODE,'zssServer','jsonAddInt' IMPORT CODE,'zssServer','jsonAddInt64' @@ -134,7 +111,6 @@ IMPORT CODE,'zssServer','jsonStartObject' IMPORT CODE,'zssServer','jsonStringProperty' IMPORT CODE,'zssServer','jsonVerifyHomogeneity' - IMPORT CODE,'zssServer','lastIndexOf' IMPORT CODE,'zssServer','logConfigureComponent' IMPORT CODE,'zssServer','logConfigureDestination' IMPORT CODE,'zssServer','logConfigureDestination2' @@ -143,19 +119,16 @@ IMPORT CODE,'zssServer','logSetLevel' IMPORT CODE,'zssServer','logShouldTraceInternal' IMPORT CODE,'zssServer','mainHttpLoop' - IMPORT CODE,'zssServer','makeBufferCharStream' + IMPORT CODE,'zssServer','makeBAOS' IMPORT CODE,'zssServer','makeCustomJsonPrinter' IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' + IMPORT CODE,'zssServer','makeCustomXmlPrinter' IMPORT CODE,'zssServer','makeFileService' IMPORT CODE,'zssServer','makeGeneratedService' IMPORT CODE,'zssServer','makeHTMLForDirectory' - IMPORT CODE,'zssServer','makeHttpConversation' IMPORT CODE,'zssServer','makeHttpDataService' IMPORT CODE,'zssServer','makeHttpDataServiceUrlMask' - IMPORT CODE,'zssServer','makeHttpRequestParser' - IMPORT CODE,'zssServer','makeHttpResponse' - IMPORT CODE,'zssServer','makeHttpServer' - IMPORT CODE,'zssServer','makeHttpServer2' + IMPORT CODE,'zssServer','makeHttpXmlPrinter' IMPORT CODE,'zssServer','makeInt64ParamSpec' IMPORT CODE,'zssServer','makeIntParamSpec' IMPORT CODE,'zssServer','makeJSONForDirectory' @@ -176,25 +149,30 @@ IMPORT CODE,'zssServer','makeWSSession' IMPORT CODE,'zssServer','makeWebPlugin' IMPORT CODE,'zssServer','makeWebSocketService' - IMPORT CODE,'zssServer','malloc31' - IMPORT CODE,'zssServer','matchWithWildcards' - IMPORT CODE,'zssServer','noisyMalloc' + IMPORT CODE,'zssServer','makeXMLNode' + IMPORT CODE,'zssServer','makeXmlParser' + IMPORT CODE,'zssServer','makeXmlPrinter' + IMPORT CODE,'zssServer','makeXmlStringParser' + IMPORT CODE,'zssServer','mapChildrenToList' + IMPORT CODE,'zssServer','nextRealSibling' + IMPORT CODE,'zssServer','nodeText' IMPORT CODE,'zssServer','nullTerminate' IMPORT CODE,'zssServer','openHTMLTemplate' - IMPORT CODE,'zssServer','padwspcs' - IMPORT CODE,'zssServer','parseInitialInt' - IMPORT CODE,'zssServer','parseInt' IMPORT CODE,'zssServer','parseURI' IMPORT CODE,'zssServer','parseURLMask' - IMPORT CODE,'zssServer','percentEncode' + IMPORT CODE,'zssServer','parseXMLNode' IMPORT CODE,'zssServer','pluginTypeFromString' IMPORT CODE,'zssServer','pluginTypeString' + IMPORT CODE,'zssServer','pprintNode' + IMPORT CODE,'zssServer','pprintNode2' IMPORT CODE,'zssServer','printStderr' IMPORT CODE,'zssServer','printStdout' + IMPORT CODE,'zssServer','printXMLToken' IMPORT CODE,'zssServer','processHttpFragment' IMPORT CODE,'zssServer','processServiceRequestParams' IMPORT CODE,'zssServer','pseudoRespond' IMPORT CODE,'zssServer','readByte' + IMPORT CODE,'zssServer','readCommentTail' IMPORT CODE,'zssServer','recoveryDisableCurrentState' IMPORT CODE,'zssServer','recoveryEnableCurrentState' IMPORT CODE,'zssServer','recoveryEstablishRouter' @@ -207,9 +185,6 @@ IMPORT CODE,'zssServer','recoverySetFlagValue' IMPORT CODE,'zssServer','recoveryUpdateRouterServiceInfo' IMPORT CODE,'zssServer','recoveryUpdateStateServiceInfo' - IMPORT CODE,'zssServer','registerHttpServerModuleWithBase' - IMPORT CODE,'zssServer','registerHttpService' - IMPORT CODE,'zssServer','registerHttpServiceOfLastResort' IMPORT CODE,'zssServer','removeLocalLoggingContext' IMPORT CODE,'zssServer','removeLoggingContext' IMPORT CODE,'zssServer','reportJSONDataProblem' @@ -225,19 +200,7 @@ IMPORT CODE,'zssServer','respondWithUnixFileContentsWithAutocvtMode' IMPORT CODE,'zssServer','respondWithUnixFileNotFound' IMPORT CODE,'zssServer','respondWithXmlPrinter' - IMPORT CODE,'zssServer','rpltrmnl' IMPORT CODE,'zssServer','runServiceThread' - IMPORT CODE,'zssServer','safeFree' - IMPORT CODE,'zssServer','safeFree31' - IMPORT CODE,'zssServer','safeFree31Key8' - IMPORT CODE,'zssServer','safeFree64' - IMPORT CODE,'zssServer','safeFree64ByToken' - IMPORT CODE,'zssServer','safeMalloc' - IMPORT CODE,'zssServer','safeMalloc2' - IMPORT CODE,'zssServer','safeMalloc31' - IMPORT CODE,'zssServer','safeMalloc31Key8' - IMPORT CODE,'zssServer','safeMalloc64' - IMPORT CODE,'zssServer','safeMalloc64ByToken' IMPORT CODE,'zssServer','safeRealloc' IMPORT CODE,'zssServer','serveFile' IMPORT CODE,'zssServer','serveSimpleTemplate' @@ -252,32 +215,20 @@ IMPORT CODE,'zssServer','setHttpSocketTrace' IMPORT CODE,'zssServer','setLoggingContext' IMPORT CODE,'zssServer','setResponseStatus' + IMPORT CODE,'zssServer','setXMLParseTrace' + IMPORT CODE,'zssServer','setXMLTrace' IMPORT CODE,'zssServer','shouldContinueGivenAllowedMethods' - IMPORT CODE,'zssServer','simpleHexFill' - IMPORT CODE,'zssServer','simpleHexPrint' - IMPORT CODE,'zssServer','simpleHexPrintLower' - IMPORT CODE,'zssServer','strcopy_safe' + IMPORT CODE,'zssServer','showStack' IMPORT CODE,'zssServer','streamBinaryForFile' IMPORT CODE,'zssServer','streamTextForFile' IMPORT CODE,'zssServer','streamToSubstitution' - IMPORT CODE,'zssServer','stringConcatenate' IMPORT CODE,'zssServer','stringListContains' IMPORT CODE,'zssServer','stringListLast' IMPORT CODE,'zssServer','stringListLength' IMPORT CODE,'zssServer','stringListPrint' - IMPORT CODE,'zssServer','strupcase' - IMPORT CODE,'zssServer','tknGetAlphanumeric' - IMPORT CODE,'zssServer','tknGetDecimal' - IMPORT CODE,'zssServer','tknGetNonWhitespace' - IMPORT CODE,'zssServer','tknGetQuoted' - IMPORT CODE,'zssServer','tknGetStandard' - IMPORT CODE,'zssServer','tknGetTerminating' - IMPORT CODE,'zssServer','tknInt' - IMPORT CODE,'zssServer','tknLength' - IMPORT CODE,'zssServer','tknText' - IMPORT CODE,'zssServer','tknTextEquals' + IMPORT CODE,'zssServer','textFromChildWithTag' IMPORT CODE,'zssServer','toASCIIUTF8' - IMPORT CODE,'zssServer','upchar' + IMPORT CODE,'zssServer','writeByte' IMPORT CODE,'zssServer','writeBytes' IMPORT CODE,'zssServer','writeFully' IMPORT CODE,'zssServer','writeHeader' @@ -285,5 +236,21 @@ IMPORT CODE,'zssServer','writeString' IMPORT CODE,'zssServer','writeTransferChunkHeader' IMPORT CODE,'zssServer','wsSessionMoreInput' + IMPORT CODE,'zssServer','xmlAddBooleanElement' + IMPORT CODE,'zssServer','xmlAddCData' + IMPORT CODE,'zssServer','xmlAddIntElement' + IMPORT CODE,'zssServer','xmlAddString' + IMPORT CODE,'zssServer','xmlAddTextElement' + IMPORT CODE,'zssServer','xmlClose' + IMPORT CODE,'zssServer','xmlEnd' + IMPORT CODE,'zssServer','xmlIndent' + IMPORT CODE,'zssServer','xmlPrint' + IMPORT CODE,'zssServer','xmlPrintBoolean' + IMPORT CODE,'zssServer','xmlPrintInt' + IMPORT CODE,'zssServer','xmlPrintPartial' + IMPORT CODE,'zssServer','xmlPrintln' + IMPORT CODE,'zssServer','xmlStart' + IMPORT CODE,'zssServer','xmlWriteDocument' + IMPORT CODE,'zssServer','xmlWriteDocumentToFile' IMPORT CODE,'zssServer','zowedump' IMPORT CODE,'zssServer','zowelog' From a5feda62a8a2f3cca0850e94b1257964d2a8c4fc Mon Sep 17 00:00:00 2001 From: Fyodor Kovin Date: Wed, 8 May 2019 11:21:42 -0400 Subject: [PATCH 5/6] blacklist a few more httpserver functions Signed-off-by: Fyodor Kovin --- build/side-deck-defs/httpserver.o-bl | 7 +++++++ lib/zss.x | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/side-deck-defs/httpserver.o-bl b/build/side-deck-defs/httpserver.o-bl index 7f6fb637a..a2d4a2d59 100644 --- a/build/side-deck-defs/httpserver.o-bl +++ b/build/side-deck-defs/httpserver.o-bl @@ -8,3 +8,10 @@ makeHttpServer2 makeHttpServer makeSecureHttpServer makeHttpConversation +processHttpFragment +setHttpParseTrace +setHttpDispatchTrace +setHttpHeadersTrace +setHttpSocketTrace +setHttpCloseConversationTrace +setHttpAuthTrace diff --git a/lib/zss.x b/lib/zss.x index 27c687c2d..a43900e0b 100644 --- a/lib/zss.x +++ b/lib/zss.x @@ -168,7 +168,6 @@ IMPORT CODE,'zssServer','printStderr' IMPORT CODE,'zssServer','printStdout' IMPORT CODE,'zssServer','printXMLToken' - IMPORT CODE,'zssServer','processHttpFragment' IMPORT CODE,'zssServer','processServiceRequestParams' IMPORT CODE,'zssServer','pseudoRespond' IMPORT CODE,'zssServer','readByte' @@ -207,12 +206,6 @@ IMPORT CODE,'zssServer','setConfiguredProperty' IMPORT CODE,'zssServer','setContentType' IMPORT CODE,'zssServer','setDefaultJSONRESTHeaders' - IMPORT CODE,'zssServer','setHttpAuthTrace' - IMPORT CODE,'zssServer','setHttpCloseConversationTrace' - IMPORT CODE,'zssServer','setHttpDispatchTrace' - IMPORT CODE,'zssServer','setHttpHeadersTrace' - IMPORT CODE,'zssServer','setHttpParseTrace' - IMPORT CODE,'zssServer','setHttpSocketTrace' IMPORT CODE,'zssServer','setLoggingContext' IMPORT CODE,'zssServer','setResponseStatus' IMPORT CODE,'zssServer','setXMLParseTrace' From 3dd09106056c9456336c9a431c626e59f7aadf1d Mon Sep 17 00:00:00 2001 From: Fyodor Kovin Date: Thu, 18 Jul 2019 10:25:32 -0400 Subject: [PATCH 6/6] Side deck: add more utils and ZIS functions, remove mainHttpLoop Signed-off-by: Fyodor Kovin --- build/side-deck-defs/client.o-wl | 1 + build/side-deck-defs/files | 1 + build/side-deck-defs/httpserver.o-bl | 1 + build/side-deck-defs/utils.o-wl | 6 ++++++ lib/zss.x | 8 +++++++- 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 build/side-deck-defs/client.o-wl diff --git a/build/side-deck-defs/client.o-wl b/build/side-deck-defs/client.o-wl new file mode 100644 index 000000000..58787c2a5 --- /dev/null +++ b/build/side-deck-defs/client.o-wl @@ -0,0 +1 @@ +zisCallService diff --git a/build/side-deck-defs/files b/build/side-deck-defs/files index 916a4eac1..4fa605131 100644 --- a/build/side-deck-defs/files +++ b/build/side-deck-defs/files @@ -1,3 +1,4 @@ recovery.o http.o httpserver.o utils.o dataservice.o json.o xml.o logging.o +client.o diff --git a/build/side-deck-defs/httpserver.o-bl b/build/side-deck-defs/httpserver.o-bl index a2d4a2d59..afb5856a5 100644 --- a/build/side-deck-defs/httpserver.o-bl +++ b/build/side-deck-defs/httpserver.o-bl @@ -15,3 +15,4 @@ setHttpHeadersTrace setHttpSocketTrace setHttpCloseConversationTrace setHttpAuthTrace +mainHttpLoop diff --git a/build/side-deck-defs/utils.o-wl b/build/side-deck-defs/utils.o-wl index 43fe90e96..149ee2c06 100644 --- a/build/side-deck-defs/utils.o-wl +++ b/build/side-deck-defs/utils.o-wl @@ -17,3 +17,9 @@ destructivelyUnasciify nullTerminate dumpbuffer cnvintst +makeBufferCharStream +charStreamPosition +charStreamGet +charStreamEOF +charStreamClose +charStreamFree diff --git a/lib/zss.x b/lib/zss.x index a43900e0b..3efeb9396 100644 --- a/lib/zss.x +++ b/lib/zss.x @@ -9,6 +9,11 @@ IMPORT CODE,'zssServer','addToStringList' IMPORT CODE,'zssServer','addToStringListUnique' IMPORT CODE,'zssServer','asciify' + IMPORT CODE,'zssServer','charStreamClose' + IMPORT CODE,'zssServer','charStreamEOF' + IMPORT CODE,'zssServer','charStreamFree' + IMPORT CODE,'zssServer','charStreamGet' + IMPORT CODE,'zssServer','charStreamPosition' IMPORT CODE,'zssServer','closeHTMLTemplate' IMPORT CODE,'zssServer','cnvintst' IMPORT CODE,'zssServer','copyString' @@ -118,8 +123,8 @@ IMPORT CODE,'zssServer','logGetLevel' IMPORT CODE,'zssServer','logSetLevel' IMPORT CODE,'zssServer','logShouldTraceInternal' - IMPORT CODE,'zssServer','mainHttpLoop' IMPORT CODE,'zssServer','makeBAOS' + IMPORT CODE,'zssServer','makeBufferCharStream' IMPORT CODE,'zssServer','makeCustomJsonPrinter' IMPORT CODE,'zssServer','makeCustomUtf8JsonPrinter' IMPORT CODE,'zssServer','makeCustomXmlPrinter' @@ -245,5 +250,6 @@ IMPORT CODE,'zssServer','xmlStart' IMPORT CODE,'zssServer','xmlWriteDocument' IMPORT CODE,'zssServer','xmlWriteDocumentToFile' + IMPORT CODE,'zssServer','zisCallService' IMPORT CODE,'zssServer','zowedump' IMPORT CODE,'zssServer','zowelog'