summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-03 18:12:53 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-03 18:12:53 +0200
commit435ea0b78d0c3d92aba868cb84dc5b7237c5742c (patch)
treef7755f81c4e7903050c053bc5c74898f76c4a7d0
parent9f6d4da1446df478bf88ac964a4d89c20870ef98 (diff)
downloadtork-435ea0b7.tar.gz
tork-435ea0b7.zip
Fix FTBFS with GCC6
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--src/crypto.cpp4
-rw-r--r--src/upnpmanager.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/crypto.cpp b/src/crypto.cpp
index cd38be1..9adfbac 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -630,8 +630,8 @@ For details, see http://sourceforge.net/projects/libb64
int base64_decode_value(char value_in)
{
- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
- static const char decoding_size = sizeof(decoding);
+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+ static const signed char decoding_size = sizeof(decoding);
value_in -= 43;
if (value_in < 0 || value_in > decoding_size) return -1;
return decoding[(int)value_in];
diff --git a/src/upnpmanager.cpp b/src/upnpmanager.cpp
index ff20746..77a7a46 100644
--- a/src/upnpmanager.cpp
+++ b/src/upnpmanager.cpp
@@ -133,7 +133,7 @@ UPnPManager* UPnPManager::manager = 0;
{
const net::ForwardPort & s = *i;
(*r)->undoForward(net::Port(s.extnumber,s.proto,s.forward),
- net::Port(s.intnumber,s.proto,s.forward),false);
+ net::Port(s.intnumber,s.proto,s.forward), 0);
}
r++;
}