nDPid: Fixed base64encode bug which lead to invalid base64 strings.

 * py-semantic-validation: Decode base64 raw packet data as well
 * nDPIsrvd.py: Added PACKETS_PLEN_MAX
 * nDPIsrvd.py: Improved JSON parse error/exception handling

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/nDPId.c b/nDPId.c
index bfa21f464..1b29bc4af 100644
--- a/nDPId.c
+++ b/nDPId.c
@@ -2406,7 +2406,7 @@ static void base64encode(uint8_t const * const data_buf,
          * if we have one byte available, then its encoding is spread
          * out over two characters
          */
-        if (resultIndex + 2 >= *resultSize - padCount - 1)
+        if (resultIndex + 2 >= *resultSize - (3 - padCount))
         {
             break;
         }
@@ -2419,7 +2419,7 @@ static void base64encode(uint8_t const * const data_buf,
          */
         if ((x + 1) < dataLength)
         {
-            if (resultIndex + 1 >= *resultSize - padCount - 1)
+            if (resultIndex + 1 >= *resultSize - (3 - padCount))
             {
                 break;
             }
@@ -2432,7 +2432,7 @@ static void base64encode(uint8_t const * const data_buf,
          */
         if ((x + 2) < dataLength)
         {
-            if (resultIndex + 1 >= *resultSize - padCount - 1)
+            if (resultIndex + 1 >= *resultSize - (3 - padCount))
             {
                 break;
             }