new file mode 100644

@@ -0,0 +1,13 @@

+diff --git a/server/restengine/httpUtilsInternal.c b/server/restengine/httpUtilsInternal.c

+index edc4033..ad7203f 100644

+--- a/server/restengine/httpUtilsInternal.c

+@@ -520,7 +520,7 @@ VmRESTCopyConfig(

+ 

+     if (!(IsNullOrEmptyString(pConfig->pszDebugLogFile)))

+     {

+-        strncpy(pRESTConfig->pszDebugLogFile, pConfig->pszDebugLogFile, (MAX_DEAMON_NAME_LEN - 1));

++        strncpy(pRESTConfig->pszDebugLogFile, pConfig->pszDebugLogFile, (MAX_PATH_LEN - 1));

+     }

+ 

+     if (!(IsNullOrEmptyString(pConfig->pszDaemonName)))

@@ -1,7 +1,7 @@

 Name:          c-rest-engine

 Summary:       minimal http(s) server library

-Version:       1.0.5

-Release:       2%{?dist}

+Version:       1.1

+Release:       1%{?dist}

 Group:         Applications/System

 Vendor:        VMware, Inc.

 License:       Apache 2.0

@@ -10,8 +10,14 @@ Requires:      openssl >= 1.0.1

 BuildRequires: coreutils >= 8.22

 BuildRequires: openssl-devel >= 1.0.1

 Source0:       %{name}-%{version}.tar.gz

-%define sha1   c-rest-engine=f846acf51e5d8b31d73d78c3d55c14e887208064

 Patch0:        c-rest-engine-aarch64.patch

+Patch1:        socket_RW.patch

+Patch2:        syslog_noInit.patch

+Patch3:        socket_logging.patch

+Patch4:        c-rest-engine-fix-log-file-len.patch

+Patch5:        errno_init.patch

+Patch6:        ssl_shutdown.patch

+%define sha1   c-rest-engine=a25927fd98ec92df5e210cc4941fa626604636f6

 %description

 c-rest-engine is a minimal embedded http(s) server written in C.

@@ -29,6 +35,12 @@ development libs and header files for c-rest-engine

 %prep

 %setup -q

 %patch0 -p1

+%patch1 -p1

+%patch2 -p1

+%patch3 -p1

+%patch4 -p1

+%patch5 -p1

+%patch6 -p1

 %build

 cd build

@@ -62,6 +74,8 @@ find %{buildroot} -name '*.la' -delete

 # %doc ChangeLog README COPYING

 %changelog

+*  Thu Nov 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.1-1

+-  Update to v1.1-1

 *  Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.5-2

 -  Aarch64 support

 *  Thu Nov 02 2017 Kumar Kaushik <kaushikk@vmware.com> 1.0.5-1

new file mode 100644

@@ -0,0 +1,111 @@

+From b9a3185e4556e8c5785a60fb57c2924bbd0529f7 Mon Sep 17 00:00:00 2001

+From: Kumar Kaushik <kaushikk@vmware.com>

+Date: Wed, 29 Nov 2017 18:47:39 -0800

+Subject: [PATCH] Avoiding previous errno variable use

+

+Change-Id: I76b0ef967df8b1ad6fa1844e1e461af470bb3b0f

+---

+ transport/posix/socket.c | 51 +++++++++++++++++++++++++++++++-----------------

+ 1 file changed, 33 insertions(+), 18 deletions(-)

+

+diff --git a/transport/posix/socket.c b/transport/posix/socket.c

+index 79c7a38..d3a3dbc 100644

+--- a/transport/posix/socket.c

+@@ -853,6 +853,8 @@ VmSockPosixRead(

+     do

+     {

+         nRead = 0;

++        errno = 0;

++        errorCode = 0;

+         if (pRESTHandle->pSSLInfo->isSecure && (pSocket->ssl != NULL))

+         {

+             nRead = SSL_read(pSocket->ssl, (pszBufPrev + nPrevBuf), MAX_DATA_BUFFER_LEN);

+@@ -864,7 +866,7 @@ VmSockPosixRead(

+             errorCode = errno;

+         }

+ 

+-        if ((nRead > 0) && (nRead <= MAX_DATA_BUFFER_LEN))

++        if (nRead > 0)

+         {

+             nPrevBuf += nRead;

+             dwError = VmRESTReallocateMemory(

+@@ -877,22 +879,6 @@ VmSockPosixRead(

+         }

+     }while((nRead > 0) && (nPrevBuf < pRESTHandle->pRESTConfig->maxDataPerConnMB));

+ 

+-    if (((pSocket->fd > 0) && (errorCode == EAGAIN || errorCode == EWOULDBLOCK)) || ((pRESTHandle->pSSLInfo->isSecure) && (errorCode == SSL_ERROR_WANT_READ)))

+-    {

+-        dwError = REST_ENGINE_SUCCESS;

+-    }

+-    else if (nRead < 0)

+-    {

+-        VMREST_LOG_ERROR(pRESTHandle, "Socket read failed with error code %u", errorCode);

+-        dwError = errorCode;

+-    }

+-    else if (nRead == 0)

+-    {

+-        VMREST_LOG_ERROR(pRESTHandle,"%s", "Socket read failed due to broken pipe");

+-        dwError = VM_SOCK_POSIX_ERROR_BROKEN_PIPE;

+-    }

+-    BAIL_ON_VMREST_ERROR(dwError);

+-

+     if (nPrevBuf >= pRESTHandle->pRESTConfig->maxDataPerConnMB)

+     {

+         /**** Discard the request here itself. This might be the first read IO cycle ****/

+@@ -901,6 +887,33 @@ VmSockPosixRead(

+     }

+     BAIL_ON_VMREST_ERROR(dwError);

+ 

++    if (nRead == -1)

++    {

++        if (((pSocket->fd > 0) && (errorCode == EAGAIN || errorCode == EWOULDBLOCK)) || ((pRESTHandle->pSSLInfo->isSecure) && (errorCode == SSL_ERROR_WANT_READ)))

++        {

++            dwError = REST_ENGINE_SUCCESS;

++        }

++        else

++        {

++            VMREST_LOG_ERROR(pRESTHandle,"%s","Unknown socket read error: errno %u, errorCode %u, nRead %d", errno, errorCode, nRead);

++            dwError = REST_ENGINE_FAILURE;

++        }

++    }

++    else

++    {

++        if (nRead == 0)

++        {

++            VMREST_LOG_ERROR(pRESTHandle,"%s","Socket Read Failed: Remote has closed the connection");

++            dwError = VM_SOCK_POSIX_ERROR_BROKEN_PIPE;

++        }

++        else

++        {

++            VMREST_LOG_ERROR(pRESTHandle, "Socket read failed with error code %u", errorCode);

++            dwError = errorCode;

++        }

++    }

++    BAIL_ON_VMREST_ERROR(dwError);

++

+     pSocket->pszBuffer = pszBufPrev;

+     pSocket->nProcessed = 0;

+     pSocket->nBufData = nPrevBuf;

+@@ -933,11 +946,12 @@ VmSockPosixRead(

+     if (pszBufPrev && pSocket && pRESTHandle->pSockContext)

+     {

+         /**** Delete the socket from poller ****/

++        

+         VmSockPosixEventQueueDelete_inlock(

+             pRESTHandle->pSockContext->pEventQueue,

+             pSocket

+             );

+-

++        

+         VmRESTFreeMemory(pszBufPrev);

+         pszBufPrev = NULL;

+         pSocket->pszBuffer = NULL;

+@@ -1566,6 +1580,7 @@ VmSockPosixSetRequestHandle(

+                       pSocket

+                       );

+         BAIL_ON_VMREST_ERROR(dwError);

++       

+ 

+         if (pSocket->pTimerSocket->fd > 0)

+         {

new file mode 100644

@@ -0,0 +1,54 @@

+diff -ru c-rest-engine-1.1/transport/posix/defines.h c-rest-engine-1.1-modified/transport/posix/defines.h

+--- c-rest-engine-1.1/transport/posix/defines.h	2017-10-31 11:20:36.000000000 -0700

+@@ -50,6 +50,7 @@

+ 

+ /**** Transport internal error codes ****/

+ #define VM_SOCK_POSIX_ERROR_SYS_CALL_FAILED    5100

++#define VM_SOCK_POSIX_ERROR_BROKEN_PIPE        5101

+ #define MAX_RETRY_ATTEMPTS                     50000

+ 

+ 

+diff -ru c-rest-engine-1.1/transport/posix/socket.c c-rest-engine-1.1-modified/transport/posix/socket.c

+--- c-rest-engine-1.1/transport/posix/socket.c	2017-10-31 11:20:36.000000000 -0700

+@@ -879,10 +879,16 @@

+     {

+         dwError = REST_ENGINE_SUCCESS;

+     }

+-    else

++    else if (nRead < 0)

+     {

++        VMREST_LOG_ERROR(pRESTHandle, "Socket read failed with error code %u", errorCode);

+         dwError = errorCode;

+     }

++    else if (nRead == 0)

++    {

++        VMREST_LOG_ERROR(pRESTHandle,"%s", "Socket read failed due to broken pipe");

++        dwError = VM_SOCK_POSIX_ERROR_BROKEN_PIPE;

++    }

+     BAIL_ON_VMREST_ERROR(dwError);

+ 

+     if (nPrevBuf >= pRESTHandle->pRESTConfig->maxDataPerConnMB)

+@@ -980,7 +986,7 @@

+              nWritten = write(pSocket->fd, (pszBuffer + nWrittenTotal) ,nRemaining);

+              errorCode = errno;

+          }

+-         if (nWritten >= 0)

++         if (nWritten > 0)

+          {

+              nWrittenTotal += nWritten;

+              nRemaining -= nWritten;

+@@ -1017,6 +1023,12 @@

+                      BAIL_ON_VMREST_ERROR(dwError);

+                  }

+              }

++             else

++             {

++                 dwError = VM_SOCK_POSIX_ERROR_SYS_CALL_FAILED;

++                 VMREST_LOG_ERROR(pRESTHandle,"Socket write failed with error code %u, dwError %u, nWritten %d", errorCode, dwError, nWritten);

++                 BAIL_ON_VMREST_ERROR(dwError);

++             }

+         }

+     }

+     VMREST_LOG_DEBUG(pRESTHandle,"\nWrite Status on Socket with fd = %d\nRequested: %d nBufLen\nWritten %d bytes\n", pSocket->fd, nBufLen, nWrittenTotal);

new file mode 100644

@@ -0,0 +1,94 @@

+From 8afe888fb34b1d121bae7701c51d0e7d0c96cbb5 Mon Sep 17 00:00:00 2001

+From: Kumar Kaushik <kaushikk@vmware.com>

+Date: Mon, 20 Nov 2017 15:21:56 -0800

+Subject: [PATCH] Adding more debug for socket read failures

+

+Change-Id: I85b10413b4fe9273a11e46da038aa2e31ffd0318

+(cherry picked from commit a0c4357aca99a08a28d10875aff87c6e3d1798be)

+---

+ common/sockinterface.c   | 11 +++++------

+ transport/posix/socket.c | 27 ++++++++++++++++++++++++++-

+ 2 files changed, 31 insertions(+), 7 deletions(-)

+

+diff --git a/common/sockinterface.c b/common/sockinterface.c

+index a53c4a5..403189c 100644

+--- a/common/sockinterface.c

+@@ -521,11 +521,10 @@ VmRESTTcpReceiveNewData(

+    {

+        VMREST_LOG_DEBUG(pRESTHandle,"%s","Calling closed connection....");

+        /**** Close connection ****/ 

+-       dwError = VmRESTDisconnectClient(

+-                     pRESTHandle,

+-                     pSocket

+-                     );

+-       BAIL_ON_VMREST_ERROR(dwError);

++       VmRESTDisconnectClient(

++           pRESTHandle,

++           pSocket

++           );

+ 

+        /****  free request object memory ****/

+        if (pRequest)

+@@ -542,7 +541,7 @@ VmRESTTcpReceiveNewData(

+ 

+ error:

+ 

+-    VMREST_LOG_DEBUG(pRESTHandle,"ERROR code %u", dwError);

++    VMREST_LOG_ERROR(pRESTHandle,"ERROR code %u", dwError);

+     goto cleanup;

+ }

+ 

+diff --git a/transport/posix/socket.c b/transport/posix/socket.c

+index 029633a..79c7a38 100644

+--- a/transport/posix/socket.c

+@@ -539,6 +539,8 @@ VmSockPosixWaitForEvent(

+                 BAIL_ON_VMREST_ERROR(dwError);

+             }

+ 

++            VMREST_LOG_DEBUG(pRESTHandle,"Notification on socket fd %d", pEventSocket->fd);

++

+             if (pEvent->events & (EPOLLERR | EPOLLHUP))

+             {

+                 eventType = VM_SOCK_EVENT_TYPE_CONNECTION_CLOSED;

+@@ -919,8 +921,23 @@ VmSockPosixRead(

+ 

+ error:

+ 

+-    if (pszBufPrev && pSocket)

++    if (pSocket)

++    {

++        VMREST_LOG_ERROR(pRESTHandle,"Socket read failed with Socket fd %d, dwError = %u, nRead = %d, errno = %u, errorCode = %u", pSocket->fd, dwError, nRead, errno, errorCode);

++    }

++    else

++    {

++        VMREST_LOG_ERROR(pRESTHandle,"Socket read failed with dwError = %u, nRead = %d, errno = %u, errorCode = %u", dwError, nRead, errno, errorCode);

++    }

++

++    if (pszBufPrev && pSocket && pRESTHandle->pSockContext)

+     {

++        /**** Delete the socket from poller ****/

++        VmSockPosixEventQueueDelete_inlock(

++            pRESTHandle->pSockContext->pEventQueue,

++            pSocket

++            );

++

+         VmRESTFreeMemory(pszBufPrev);

+         pszBufPrev = NULL;

+         pSocket->pszBuffer = NULL;

+@@ -1542,6 +1559,14 @@ VmSockPosixSetRequestHandle(

+                       pSocket->pTimerSocket

+                       );

+         BAIL_ON_VMREST_ERROR(dwError);

++

++        /**** Delete actual IO socket from poller ****/

++        dwError = VmSockPosixEventQueueDelete_inlock(

++                      pQueue,

++                      pSocket

++                      );

++        BAIL_ON_VMREST_ERROR(dwError);

++

+         if (pSocket->pTimerSocket->fd > 0)

+         {

+             close(pSocket->pTimerSocket->fd);

new file mode 100644

@@ -0,0 +1,123 @@

+From a7aba08f7fd2700c92fd9661eee212755ba8795e Mon Sep 17 00:00:00 2001

+From: Kumar Kaushik <kaushikk@vmware.com>

+Date: Thu, 7 Dec 2017 12:53:17 -0800

+Subject: [PATCH] Fixing tls: unexpected message ERROR

+

+Change-Id: I63dce89d4dcfa445b6594d4b776ef8827f1498ff

+(cherry picked from commit 424f6d0f3435eccad781d39ef0c656a00395dc46)

+---

+ transport/posix/socket.c | 34 +++++++++++++++++++++++-----------

+ 1 file changed, 23 insertions(+), 11 deletions(-)

+

+diff --git a/transport/posix/socket.c b/transport/posix/socket.c

+index d3a3dbc..18cef89 100644

+--- a/transport/posix/socket.c

+@@ -576,7 +576,6 @@ VmSockPosixWaitForEvent(

+                                    FALSE

+                                    );

+                     BAIL_ON_VMREST_ERROR(dwError);

+-                

+                 }

+ 

+                 dwError = VmSockPosixEventQueueAdd_inlock(

+@@ -895,7 +894,7 @@ VmSockPosixRead(

+         }

+         else

+         {

+-            VMREST_LOG_ERROR(pRESTHandle,"%s","Unknown socket read error: errno %u, errorCode %u, nRead %d", errno, errorCode, nRead);

++            VMREST_LOG_ERROR(pRESTHandle,"Unknown socket read error: errno %u, errorCode %u, nRead %d", errno, errorCode, nRead);

+             dwError = REST_ENGINE_FAILURE;

+         }

+     }

+@@ -1007,6 +1006,9 @@ VmSockPosixWrite(

+ 

+     while(nWrittenTotal < nBufLen )

+     {

++         nWritten = 0;

++         errorCode = 0;

++         errno = 0;

+          if (pRESTHandle->pSSLInfo->isSecure && (pSocket->ssl != NULL))

+          {

+              nWritten = SSL_write(pSocket->ssl,(pszBuffer + nWrittenTotal),nRemaining);

+@@ -1030,7 +1032,7 @@ VmSockPosixWrite(

+          }

+          else

+          {

+-             if (errorCode == EAGAIN || errorCode == EWOULDBLOCK || errorCode == SSL_ERROR_WANT_WRITE)

++             if ((nWritten < 0) && (errorCode == EAGAIN || errorCode == EWOULDBLOCK || errorCode == SSL_ERROR_WANT_WRITE))

+              {

+                  if (timeOutSec >= 0)

+                  {

+@@ -1101,6 +1103,8 @@ VmSockPosixCloseSocket(

+     )

+ {

+     DWORD                            dwError = REST_ENGINE_SUCCESS;

++    int                              ret = 0;

++    uint32_t                         errorCode = 0;

+     BOOLEAN                          bLocked = FALSE;

+ 

+     if (!pRESTHandle || !pSocket )

+@@ -1121,18 +1125,24 @@ VmSockPosixCloseSocket(

+         pSocket->pTimerSocket->fd = -1;

+     }

+ 

++    if (pRESTHandle->pSSLInfo->isSecure && pSocket->ssl)

++    {

++        ret = SSL_shutdown(pSocket->ssl);

++        if (ret < 0)

++        {

++            errorCode = SSL_get_error(pSocket->ssl, ret);

++            VMREST_LOG_ERROR(pRESTHandle,"Error on SSL_shutdown on socket %d, return value %d, errorCode %u", pSocket->fd, ret, errorCode);

++        }

++        SSL_free(pSocket->ssl);

++        pSocket->ssl = NULL;

++    }

++

+     if (pSocket->fd >= 0)

+     {

+         close(pSocket->fd);

+         pSocket->fd = -1;

+     }

+ 

+-    if (pRESTHandle->pSSLInfo->isSecure && pSocket->ssl)

+-    {

+-        SSL_shutdown(pSocket->ssl);

+-        SSL_free(pSocket->ssl);

+-        pSocket->ssl = NULL;

+-    }

+ 

+ cleanup:

+ 

+@@ -1742,6 +1752,7 @@ VmSockPosixIsSafeToCloseConnOnTimeOut(

+     BAIL_ON_VMREST_ERROR(dwError);

+ 

+     pSocket = pTimerSocket->pIoSocket;

++    errno = 0;

+ 

+     if ((pRESTHandle->pSSLInfo->isSecure) && (pSocket->ssl))

+     {

+@@ -1771,6 +1782,7 @@ VmSockPosixIsSafeToCloseConnOnTimeOut(

+             do

+             {

+                 errorCode = 0;

++                errno = 0;

+                 nRead = 0;

+                 nRead = read(pTimerSocket->fd, &res, sizeof(res));

+                 errorCode = errno;

+@@ -1918,13 +1930,13 @@ VmRESTAcceptSSLContext(

+     }

+     else if ((ret == -1) && ((errorCode == SSL_ERROR_WANT_READ) || (errorCode == SSL_ERROR_WANT_WRITE)))

+     {

+-       VMREST_LOG_DEBUG(pRESTHandle,"SSL handshake not completed for socket %d", pSocket->fd);

++       VMREST_LOG_DEBUG(pRESTHandle," SSL handshake not completed for socket %d, ret %d, errorCode %u", pSocket->fd, ret, errorCode);

+        pSocket->bSSLHandShakeCompleted = FALSE;

+        bReArm = TRUE;

+     }

+     else

+     {

+-        VMREST_LOG_ERROR(pRESTHandle, "SSL handshake failed...connection will be closed for socket with fd %d", pSocket->fd);

++        VMREST_LOG_ERROR(pRESTHandle, "SSL handshake failed...connection will be closed for socket with fd %d, ret %d, errorCode %u", pSocket->fd, ret, errorCode);

+         dwError = VMREST_TRANSPORT_SSL_ACCEPT_FAILED;

+         BAIL_ON_VMREST_ERROR(dwError);

+     }

new file mode 100644

@@ -0,0 +1,151 @@

+From 56c8c0ffd82c8fe8c396d8c00f23688adcdc9ecd Mon Sep 17 00:00:00 2001

+From: Kumar Kaushik <kaushikk@vmware.com>

+Date: Wed, 15 Nov 2017 17:24:44 -0800

+Subject: [PATCH] Remove init/shutdown of syslog from library

+

+Change-Id: I7705f44c468d2ce69a15b531e108ef0cfbe391b8

+---

+ build/package/rpm/c-rest-engine.spec |  4 +++-

+ common/logging.c                     | 45 ++++++++----------------------------

+ server/vmrestd/main.c                |  8 ++++++-

+ 3 files changed, 20 insertions(+), 37 deletions(-)

+

+diff --git a/build/package/rpm/c-rest-engine.spec b/build/package/rpm/c-rest-engine.spec

+index 8730113..02c1e62 100644

+--- a/build/package/rpm/c-rest-engine.spec

+@@ -1,7 +1,7 @@

+ Name:          c-rest-engine

+ Summary:       Minimal http(s) server library

+ Version:       1.1

+-Release:       1%{?dist}

++Release:       3%{?dist}

+ Group:         Applications/System

+ Vendor:        VMware, Inc.

+ License:       Apache 2.0

+diff --git a/common/logging.c b/common/logging.c

+index 6bef25c..385c0b6 100644

+--- a/common/logging.c

+@@ -41,13 +41,7 @@ VmRESTLogInitialize(

+     }

+     BAIL_ON_VMREST_ERROR(dwError);

+ 

+-    if (pRESTHandle->pRESTConfig->useSysLog)

+-    {

+-        /**** Use syslog ****/

+-        openlog(pRESTHandle->pRESTConfig->pszDaemonName, 0, LOG_DAEMON);

+-        setlogmask(LOG_UPTO(logLevelToSysLogLevel(pRESTHandle->debugLogLevel)));

+-    }

+-    else if (!(IsNullOrEmptyString(pRESTHandle->pRESTConfig->pszDebugLogFile)))

++    if ((!(IsNullOrEmptyString(pRESTHandle->pRESTConfig->pszDebugLogFile))) && (pRESTHandle->pRESTConfig->useSysLog == FALSE))

+     {

+         if ((pRESTHandle->logFile = fopen(pRESTHandle->pRESTConfig->pszDebugLogFile, "a")) == NULL)

+         {

+@@ -55,10 +49,6 @@ VmRESTLogInitialize(

+             dwError = REST_ENGINE_FAILURE;

+         }

+     }

+-    else

+-    {

+-        dwError = REST_ENGINE_FAILURE;

+-    }

+     BAIL_ON_VMREST_ERROR(dwError);

+ 

+ cleanup:

+@@ -76,11 +66,7 @@ VmRESTLogTerminate(

+     PVMREST_HANDLE                   pRESTHandle

+     )

+ {

+-    if (pRESTHandle && pRESTHandle->pRESTConfig->useSysLog)

+-    {

+-        closelog();

+-    }

+-    else if (pRESTHandle && pRESTHandle->logFile != NULL)

++    if (pRESTHandle && pRESTHandle->logFile != NULL)

+     {

+        fclose(pRESTHandle->logFile);

+        pRESTHandle->logFile = NULL;

+@@ -95,10 +81,9 @@ VmRESTLog(

+     ...)

+ {

+     char        extraLogMessage[EXTRA_LOG_MESSAGE_LEN] = {0};

+-    struct      timespec tspec = {0};

+-    time_t      ltime;

+-    struct      tm mytm = {0};

+     char        logMessage[MAX_LOG_MESSAGE_LEN];

++    struct      tm* tm_info = NULL;

++    struct      timeval tv = {0};

+ 	

+     va_list     va;

+     const char* logLevelTag = "";

+@@ -115,30 +100,20 @@ VmRESTLog(

+         vsnprintf( logMessage, sizeof(logMessage), fmt, va );

+         logMessage[sizeof(logMessage)-1] = '\0';

+         va_end( va );

+-        ltime = time(&ltime);

++        gettimeofday(&tv, NULL);

++

++        tm_info = localtime(&tv.tv_sec);

+         logLevelTag = logLevelToTag(level);

+-        localtime_r(&ltime, &mytm);

+-        snprintf(extraLogMessage, sizeof(extraLogMessage) - 1,

+-                  "%4d%2d%2d%2d%2d%2d.%03ld:t@%lu:%-3.7s: ",

+-                  mytm.tm_year+1900,

+-                  mytm.tm_mon+1,

+-                  mytm.tm_mday,

+-                  mytm.tm_hour,

+-                  mytm.tm_min,

+-                  mytm.tm_sec,

+-                  tspec.tv_nsec/NSECS_PER_MSEC,

+-                  (unsigned long) pthread_self(),

+-                  logLevelTag? logLevelTag : "UNKNOWN");

++        strftime(extraLogMessage, sizeof(extraLogMessage) - 1, "%F %T", tm_info);   

+ 

+         if (pRESTHandle->pRESTConfig->useSysLog)

+         {

+             sysLogLevel = logLevelToSysLogLevel(level);

+-            snprintf(extraLogMessage, sizeof(extraLogMessage) - 1, "t@%lu: ", (unsigned long) pthread_self());

+-            syslog(sysLogLevel, "%s: %s%s", logLevelToTag(level), extraLogMessage, logMessage);

++            syslog(sysLogLevel, "%s:%lu t@%lu %-3.7s: %s\n", extraLogMessage, (long unsigned)(tv.tv_usec), (unsigned long) pthread_self(),(logLevelTag? logLevelTag : "UNKNOWN"),logMessage);

+         }

+         else if (pRESTHandle->logFile != NULL)

+         {

+-            fprintf(pRESTHandle->logFile, "%s%s\n", extraLogMessage, logMessage);

++            fprintf(pRESTHandle->logFile, "%s:%lu t@%lu %-3.7s: %s\n", extraLogMessage, (long unsigned)(tv.tv_usec), (unsigned long) pthread_self(),(logLevelTag? logLevelTag : "UNKNOWN"),logMessage);

+             fflush( pRESTHandle->logFile );

+         }

+     }

+diff --git a/server/vmrestd/main.c b/server/vmrestd/main.c

+index 353f597..214b28d 100644

+--- a/server/vmrestd/main.c

+@@ -116,7 +116,7 @@ int main()

+     pConfig1->maxDataPerConnMB = 10;

+     pConfig1->nWorkerThr = 5;

+     pConfig1->nClientCnt = 5;

+-    pConfig1->useSysLog = FALSE;

++    pConfig1->useSysLog = TRUE;

+     pConfig1->pszSSLCertificate = "/root/mycert.pem";

+     pConfig1->isSecure = TRUE;

+     pConfig1->pszSSLKey = "/root/mycert.pem";

+@@ -127,6 +127,10 @@ int main()

+     pConfig1->pszSSLCipherList = NULL;

+     pConfig1->SSLCtxOptionsFlag = 0;

+ 

++    /**** Init sys log ****/

++    openlog("VMREST_KAUSHIK", 0, LOG_DAEMON);

++    setlogmask(LOG_UPTO(LOG_DEBUG));

++

+     dwError = VmRESTInit(pConfig, &gpRESTHandle);

+     dwError = VmRESTInit(pConfig1, &gpRESTHandle1);

+ 

+@@ -177,6 +181,8 @@ int main()

+  //   VmRESTShutdownSSL(sslCtx1);

+ #endif

+ 

++    closelog();

++

+ return dwError;

+ 

+ }

@@ -1,14 +1,14 @@

 Name:          lightwave

 Summary:       VMware Lightwave

-Version:       1.3.1

-Release:       5%{?dist}

+Version:       1.3.1.7

+Release:       1%{?dist}

 License:       Apache 2.0

 Group:         Applications/System

 Vendor:        VMware, Inc.

 URL: 	       https://github.com/vmware/lightwave

 Source0:       lightwave-%{version}.tar.gz

 Patch0:        lightwave-gssapi-unix-creds-separation.patch

-%define sha1 lightwave=e8cc3582ffe0586b9b21ef87d9abe4160854e9c4

+%define sha1 lightwave=abe987b67aadab05040ac38c11474b8d93fe8644

 Distribution:  Photon

 Requires:  apache-tomcat >= 8.5.8

@@ -27,7 +27,7 @@ Requires:  lightwave-client = %{version}

 BuildRequires: ant-contrib >= 1.0

 BuildRequires: apache-maven >= 3.3.9

 BuildRequires: boost-devel = 1.63.0

-BuildRequires: c-rest-engine-devel

+BuildRequires: c-rest-engine-devel >= 1.1

 BuildRequires: commons-daemon >= 1.0.15

 BuildRequires: copenapi-devel

 BuildRequires: coreutils >= 8.22

@@ -41,6 +41,7 @@ BuildRequires: openssl-devel >= 1.0.2

 BuildRequires: python2-devel >= 2.7.8

 BuildRequires: sqlite-devel >= 3.14

 BuildRequires: go

+BuildRequires: binutils

 %description

 VMware Lightwave Server

@@ -94,7 +95,7 @@ Client libraries to communicate with Lightwave Services

 %package client

 Summary: Lightwave Client

-Requires: c-rest-engine

+Requires: c-rest-engine >= 1.1

 Requires: copenapi

 Requires: coreutils >= 8.22

 Requires: cyrus-sasl >= 2.1

@@ -915,6 +916,9 @@ fi

 %{_datadir}/config/vmdns-rest.json

 %{_datadir}/config/vmdnsd-syslog-ng.conf

 %{_datadir}/config/idm/*

+%{_datadir}/config/vmca-telegraf.conf

+%{_datadir}/config/vmdir-telegraf.conf

+%{_datadir}/config/vmdns-telegraf.conf

 %{_jarsdir}/openidconnect-client-lib.jar

 %{_jarsdir}/openidconnect-common.jar

@@ -939,13 +943,23 @@ fi

 %{_jarsdir}/log4j-api-2.8.2.jar

 %{_jarsdir}/log4j-slf4j-impl-2.8.2.jar

 %{_jarsdir}/log4j-core-2.8.2.jar

+%{_jarsdir}/args4j-2.33.jar

+%{_jarsdir}/commons-codec-1.9.jar

+%{_jarsdir}/commons-lang3-3.3.2.jar

+%{_jarsdir}/httpcore-4.4.4.jar

+%{_jarsdir}/jackson-annotations-2.8.4.jar

+%{_jarsdir}/jackson-core-2.8.4.jar

+%{_jarsdir}/jackson-databind-2.8.4.jar

+%{_jarsdir}/jersey-media-json-jackson-2.25.1.jar

+%{_jarsdir}/json-smart-1.3.1.jar

+%{_jarsdir}/nimbus-jose-jwt-4.12.jar

 %{_webappsdir}/lightwaveui.war

 %{_webappsdir}/ROOT.war

-%{_configdir}/firewall.json

 %{_configdir}/setfirewallrules.py

+%{_configdir}/lw-firewall-server.json

 %{_servicedir}/firewall.service

 %{_servicedir}/vmware-stsd.service

@@ -959,6 +973,7 @@ fi

 %config %attr(600, root, root) %{_prefix}/vmware-sts/conf/server.xml

 %config %attr(600, root, root) %{_prefix}/vmware-sts/conf/web.xml

 %config %attr(600, root, root) %{_prefix}/vmware-sts/conf/tomcat-users.xml

+%config %attr(600, root, root) %{_prefix}/vmware-sts/conf/vmsts-telegraf.conf

 %files client-libs

 %{_lib64dir}/libvmafcfgapi.so*

@@ -1017,6 +1032,11 @@ fi

 %{_datadir}/config/vmdir-client.reg

 %{_datadir}/config/vmdns-client.reg

 %{_datadir}/config/vmafdd-syslog-ng.conf

+%{_datadir}/config/lw-firewall-client.json

+%{_datadir}/config/refresh-resolve-conf.sh

+%{_datadir}/config/telegraf.conf

+%{_datadir}/config/vmafd-telegraf.conf

+

 %{_jreextdir}/vmware-endpoint-certificate-store.jar

 %{_jreextdir}/client-domain-controller-cache.jar

@@ -1101,11 +1121,10 @@ fi

 %{_sbindir}/postd

 %{_bindir}/postadmintool

-%{_bindir}/lwraftleavefed

-%{_bindir}/lwraftaclmgr

 %{_bindir}/lwraftpromo

 %{_bindir}/postschema

 %{_bindir}/post-cli

+%{_bindir}/postaclmgr

 %{_lib64dir}/sasl2/libsaslpostdb.so*

@@ -1115,10 +1134,15 @@ fi

 %{_datadir}/config/post.reg

 %{_datadir}/config/postd-syslog-ng.conf

 %{_datadir}/config/post-client.reg

+%{_datadir}/config/lw-firewall-post.json

+%{_datadir}/config/post-demote-deads.sh

+%{_datadir}/config/post-telegraf.conf

 # %doc ChangeLog README COPYING

 %changelog

+*   Thu Nov 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.1.7-1

+-   update to lightwave 1.3.1.7 (release 1.3.1-7 in lightwave repo)

 *   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.1-5

 -   Requires coreutils or toybox

 *   Fri Sep 22 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.1-4

new file mode 100644

@@ -0,0 +1,194 @@

+diff --git a/conf/pmd.conf b/conf/pmd.conf

+index c4c5a66..f622385 100644

+--- a/conf/pmd.conf

+@@ -9,6 +9,11 @@ rolepluginsdir=/etc/javelin.roles.plugins.d

+ enabled=1

+ port=2081

+ apispec=/etc/pmd/restapispec.json

++sslcert=/etc/pmd/server.crt

++sslkey=/etc/pmd/server.key

++logfile=/var/log/pmd/restServer.log

++client-count=5

++worker-thread-count=5

+ 

+ [rpc-server]

+ enabled=1

+diff --git a/server/config.c b/server/config.c

+index ef42750..e7841a5 100644

+--- a/server/config.c

+@@ -44,6 +44,21 @@ pmd_get_rest_config(

+                                (void **)&pRestConfig);

+     BAIL_ON_PMD_ERROR(dwError);

+ 

++    //set defaults

++    pRestConfig->nWorkerThreadCount = PMD_REST_DEFAULT_WORKER_THREAD;

++    pRestConfig->nClientCount = PMD_REST_DEFAULT_CLIENTS;

++    dwError = PMDAllocateString(PMD_REST_DEFAULT_SSL_CERT,

++                                &pRestConfig->pszSSLCert);

++    BAIL_ON_PMD_ERROR(dwError);

++    dwError = PMDAllocateString(PMD_REST_DEFAULT_SSL_KEY,

++                                &pRestConfig->pszSSLKey);

++

++    BAIL_ON_PMD_ERROR(dwError);

++    dwError = PMDAllocateString(PMD_REST_DEFAULT_LOG_FILE,

++                                &pRestConfig->pszLogFile);

++    BAIL_ON_PMD_ERROR(dwError);

++

++

+     pKeyValues = pSection->pKeyValues;

+     for(; pKeyValues; pKeyValues = pKeyValues->pNext)

+     {

+@@ -55,6 +70,16 @@ pmd_get_rest_config(

+         {

+             pRestConfig->nPort = atoi(pKeyValues->pszValue);

+         }

++        else if(!strcmp(PMD_CONFIG_KEY_REST_WORKER_THREAD_COUNT,

++                        pKeyValues->pszKey))

++        {

++            pRestConfig->nWorkerThreadCount = atoi(pKeyValues->pszValue);

++        }

++        else if(!strcmp(PMD_CONFIG_KEY_REST_CLIENT_COUNT,

++                        pKeyValues->pszKey))

++        {

++            pRestConfig->nClientCount = atoi(pKeyValues->pszValue);

++        }

+         else if(!strcmp(PMD_CONFIG_KEY_REST_APISPEC, pKeyValues->pszKey))

+         {

+             dwError = PMDAllocateString(pKeyValues->pszValue,

+@@ -66,6 +91,24 @@ pmd_get_rest_config(

+             pRestConfig->nUseKerberos =

+                 strcmp(pKeyValues->pszValue, "kerberos") == 0;

+         }

++        else if(!strcmp(PMD_CONFIG_KEY_REST_SSL_CERT, pKeyValues->pszKey))

++        {

++            dwError = PMDAllocateString(pKeyValues->pszValue,

++                                        &pRestConfig->pszSSLCert);

++            BAIL_ON_PMD_ERROR(dwError);

++        }

++        else if(!strcmp(PMD_CONFIG_KEY_REST_SSL_KEY, pKeyValues->pszKey))

++        {

++            dwError = PMDAllocateString(pKeyValues->pszValue,

++                                        &pRestConfig->pszSSLKey);

++            BAIL_ON_PMD_ERROR(dwError);

++        }

++        else if(!strcmp(PMD_CONFIG_KEY_REST_LOG_FILE, pKeyValues->pszKey))

++        {

++            dwError = PMDAllocateString(pKeyValues->pszValue,

++                                        &pRestConfig->pszLogFile);

++            BAIL_ON_PMD_ERROR(dwError);

++        }

+     }

+ 

+     *ppRestConfig = pRestConfig;

+@@ -171,6 +214,9 @@ pmd_free_rest_config(

+         return;

+     }

+     PMD_SAFE_FREE_MEMORY(pRestConf->pszApiSpec);

++    PMD_SAFE_FREE_MEMORY(pRestConf->pszLogFile);

++    PMD_SAFE_FREE_MEMORY(pRestConf->pszSSLCert);

++    PMD_SAFE_FREE_MEMORY(pRestConf->pszSSLKey);

+     PMD_SAFE_FREE_MEMORY(pRestConf);

+ }

+ 

+diff --git a/server/defines.h b/server/defines.h

+index 513a1f2..43e1022 100644

+--- a/server/defines.h

+@@ -33,6 +33,11 @@ typedef struct _PMDHANDLE_* PPMDHANDLE;

+ #define PMD_CONFIG_KEY_REST_PORT    "port"

+ #define PMD_CONFIG_KEY_REST_APISPEC "apispec"

+ #define PMD_CONFIG_KEY_REST_AUTH    "authenticate"

++#define PMD_CONFIG_KEY_REST_SSL_CERT "sslcert"

++#define PMD_CONFIG_KEY_REST_SSL_KEY "sslkey"

++#define PMD_CONFIG_KEY_REST_WORKER_THREAD_COUNT "worker-thread-count"

++#define PMD_CONFIG_KEY_REST_CLIENT_COUNT "client-count"

++#define PMD_CONFIG_KEY_REST_LOG_FILE "logfile"

+ 

+ #define PMD_CONFIG_KEY_SERVERTYPE "servertype"

+ #define PMD_CONFIG_KEY_CURRENTHASH "currenthash"

+@@ -51,3 +56,10 @@ typedef struct _PMDHANDLE_* PPMDHANDLE;

+ #define PKG_PRIVSEP "pkg_privsep"

+ #define NET_PRIVSEP "net_privsep"

+ #define USERMGMT_PRIVSEP "usermgmt_privsep"

++

++#define VMREST_STOP_TIMEOUT_SECS       2

++#define PMD_REST_DEFAULT_WORKER_THREAD 5

++#define PMD_REST_DEFAULT_CLIENTS       5

++#define PMD_REST_DEFAULT_LOG_FILE      "/var/log/pmd/restServer.log"

++#define PMD_REST_DEFAULT_SSL_CERT      "/etc/pmd/server.crt"

++#define PMD_REST_DEFAULT_SSL_KEY       "/etc/pmd/server.key"

+diff --git a/server/restserver.c b/server/restserver.c

+index 4f8f337..41d0c13 100644

+--- a/server/restserver.c

+@@ -22,6 +22,7 @@ StartRestServer(

+     PREST_API_DEF pApiDef = NULL;

+     PREST_PROCESSOR pRestProcessor = NULL;

+     PPMD_REST_CONFIG pRestConfig = NULL;

++    REST_CONF stRestConfig = {0};

+ 

+     MODULE_REG_MAP stRegMap[] =

+     {

+@@ -46,9 +47,19 @@ StartRestServer(

+         BAIL_ON_PMD_ERROR(dwError);

+     }

+ 

++    stRestConfig.serverPort = pRestConfig->nPort;

++    stRestConfig.nWorkerThr = pRestConfig->nWorkerThreadCount;

++    stRestConfig.nClientCnt = pRestConfig->nClientCount;

++    stRestConfig.pszSSLCertificate = pRestConfig->pszSSLCert;

++    stRestConfig.pszSSLKey = pRestConfig->pszSSLKey;

++    stRestConfig.pszDebugLogFile = pRestConfig->pszLogFile;

++    stRestConfig.isSecure = 1;

++    stRestConfig.debugLogLevel = VMREST_LOG_LEVEL_ERROR;

++    stRestConfig.useSysLog = 1;

++fprintf(stdout, "log = %s\n", stRestConfig.pszDebugLogFile);

++

+     dwError =  VmRESTInit(

+-                   NULL,

+-                   "/etc/pmd/restconfig.txt",

++                   &stRestConfig,

+                    &gpServerEnv->pRestHandle);