sipwise
/
sems
mirror of https://github.com/sipwise/sems.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#62181 XMLRPC: use more appropriate int types

Browse Source 
Store integers as long to reduce likelihood of overflows. Retain
overloaded accessors for compatibility.

Use time_t and suseconds_t for timestamps.

Fix up formatting strings to match the new types and to also fix
incorrect formatting of decimal values.

Remove unused methods.

Change-Id: I58bfcd8a34bef2363eac06242dfedf6aae8451e0
master
Richard Fuchs 2 months ago
parent 3ed4f30c51
commit 4970eefaaf
4 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File

41
apps/sbc/call_control/prepaid_xmlrpc/PrepaidXMLRPC.cpp
Unescape View File

@ -171,7 +171,7 @@ void PrepaidXMLRPC::invoke(const string& method, const AmArg& args, AmArg& ret)
void PrepaidXMLRPC::start(const string& cc_name, const string& ltag,
SBCCallProfile* call_profile,
int start_ts_sec, int start_ts_usec,
time_t start_ts_sec, suseconds_t start_ts_usec,
const AmArg& values, int timer_id, AmArg& res) {
if (!call_profile) return;
@ -193,7 +193,7 @@ void PrepaidXMLRPC::start(const string& cc_name, const string& ltag,
call_profile->cc_vars[cc_name+"::"+SBCVAR_PREPAID_XMLRPC_UUID] = uuid;
bool found;
int credit = getCredit(uuid, found);
long credit = getCredit(uuid, found);
if (!found) {
ERROR("Failed to fetch credit for uuid '%s'\n", uuid.c_str());
res_cmd[SBC_CC_ACTION] = SBC_CC_REFUSE_ACTION;
@ -210,7 +210,7 @@ void PrepaidXMLRPC::start(const string& cc_name, const string& ltag,
}
// Set Timer:
DBG("setting prepaid call timer ID %i of %i seconds\n", timer_id, credit);
DBG("setting prepaid call timer ID %d of %ld seconds\n", timer_id, credit);
res_cmd[SBC_CC_ACTION] = SBC_CC_SET_CALL_TIMER_ACTION;
res_cmd[SBC_CC_TIMER_TIMEOUT] = credit;
}
@ -218,15 +218,15 @@ void PrepaidXMLRPC::start(const string& cc_name, const string& ltag,
void PrepaidXMLRPC::connect(const string& cc_name,
const string& ltag, SBCCallProfile* call_profile,
const string& other_tag,
int connect_ts_sec, int connect_ts_usec) {
time_t connect_ts_sec, suseconds_t connect_ts_usec) {
// DBG("call '%s' gets connected\n", ltag.c_str());
}
void PrepaidXMLRPC::end(const string& cc_name, const string& ltag,
SBCCallProfile* call_profile,
int start_ts_sec, int start_ts_usec,
int connect_ts_sec, int connect_ts_usec,
int end_ts_sec, int end_ts_usec) {
time_t start_ts_sec, suseconds_t start_ts_usec,
time_t connect_ts_sec, suseconds_t connect_ts_usec,
time_t end_ts_sec, suseconds_t end_ts_usec) {
if (!call_profile) return;
@ -234,10 +234,10 @@ void PrepaidXMLRPC::end(const string& cc_name, const string& ltag,
SBCVarMapIteratorT vars_it = call_profile->cc_vars.find(cc_name+"::"+SBCVAR_PREPAID_XMLRPC_UUID);
if (vars_it == call_profile->cc_vars.end() || !isArgCStr(vars_it->second)) {
ERROR("internal: could not find UUID for call '%s' - "
"not accounting (start_ts %i.%i, connect_ts %i.%i, end_ts %i.%i)\n",
ltag.c_str(), start_ts_sec, start_ts_usec,
connect_ts_sec, connect_ts_usec,
end_ts_sec, end_ts_usec);
"not accounting (start_ts %ld.%06ld, connect_ts %ld.%06ld, end_ts %ld.%06ld)\n",
ltag.c_str(), static_cast<long>(start_ts_sec), static_cast<long>(start_ts_usec),
static_cast<long>(connect_ts_sec), static_cast<long>(connect_ts_usec),
static_cast<long>(end_ts_sec), static_cast<long>(end_ts_usec));
return;
}
@ -265,7 +265,7 @@ void PrepaidXMLRPC::end(const string& cc_name, const string& ltag,
if (diff.tv_usec >= 500000)
diff.tv_sec++;
DBG("call ltag '%s' for uuid '%s' lasted %lds\n", ltag.c_str(), uuid.c_str(), diff.tv_sec);
DBG("call ltag '%s' for uuid '%s' lasted %lds\n", ltag.c_str(), uuid.c_str(), static_cast<long>(diff.tv_sec));
bool found;
subtractCredit(uuid, diff.tv_sec, found);
@ -275,7 +275,7 @@ void PrepaidXMLRPC::end(const string& cc_name, const string& ltag,
}
/* accounting functions... */
int PrepaidXMLRPC::getCredit(string pin, bool& found) {
long PrepaidXMLRPC::getCredit(string pin, bool& found) {
const char* _uri = 0;
if (!uri.empty())
@ -286,14 +286,14 @@ int PrepaidXMLRPC::getCredit(string pin, bool& found) {
XmlRpcValue xmlArg;
xmlArg[0] = pin;
found = xmlrpccall.execute("getCredit", xmlArg, result);
int res = 0;
long res = 0;
if (found)
res = result;
DBG("Credit Left '%u' .\n", res);
DBG("Credit Left '%ld' .\n", res);
return res;
}
int PrepaidXMLRPC::subtractCredit(string pin, int amount, bool& found) {
long PrepaidXMLRPC::subtractCredit(string pin, long amount, bool& found) {
const char* _uri = 0;
if (!uri.empty())
_uri = uri.c_str();
@ -303,14 +303,13 @@ int PrepaidXMLRPC::subtractCredit(string pin, int amount, bool& found) {
XmlRpcValue xmlArg;
xmlArg[0][0]["methodName"] = "subtractCredit";
xmlArg[0][0]["pin"] = pin;
xmlArg[0][0]["amount"] = amount;
DBG("subtractCredit pin# '%s', Seconds '%u'.\n", pin.c_str(),
amount );
xmlArg[0][0]["amount"] = amount;
DBG("subtractCredit pin# '%s', Seconds '%ld'.\n", pin.c_str(), amount );
found = xmlrpccall.execute("subtractCredit", xmlArg, result);
int res = 0;
long res = 0;
if (found)
res = result;
DBG("Credit Left '%u' .\n", res);
DBG("Credit Left '%ld' .\n", res);
return res;
}

22
apps/sbc/call_control/prepaid_xmlrpc/PrepaidXMLRPC.h
Unescape View File

@ -30,6 +30,7 @@
#include "SBCCallProfile.h"
#include <sys/time.h>
#include <map>
/**
@ -43,31 +44,26 @@ class PrepaidXMLRPC : public AmDynInvoke
unsigned int port;
string uri;
std::map<string, unsigned int> credits;
std::map<string, unsigned long> credits;
AmMutex credits_mut;
/** @returns credit for pin, found=false if pin wrong */
int getCredit(string pin, bool& found);
long getCredit(string pin, bool& found);
/** @returns remaining credit */
int subtractCredit(string pin, int amount, bool& found);
/** adds some amount */
int addCredit(string pin, int amount);
/** sets the value to some amount */
int setCredit(string pin, int amount);
long subtractCredit(string pin, long amount, bool& found);
void start(const string& cc_name, const string& ltag, SBCCallProfile* call_profile,
int start_ts_sec, int start_ts_usec, const AmArg& values,
time_t start_ts_sec, suseconds_t start_ts_usec, const AmArg& values,
int timer_id, AmArg& res);
void connect(const string& cc_name, const string& ltag, SBCCallProfile* call_profile,
const string& other_ltag,
int connect_ts_sec, int connect_ts_usec);
time_t connect_ts_sec, suseconds_t connect_ts_usec);
void end(const string& cc_name, const string& ltag, SBCCallProfile* call_profile,
int start_ts_sec, int start_ts_usec,
int connect_ts_sec, int connect_ts_usec,
int end_ts_sec, int end_ts_usec);
time_t start_ts_sec, suseconds_t start_ts_usec,
time_t connect_ts_sec, suseconds_t connect_ts_usec,
time_t end_ts_sec, suseconds_t end_ts_usec);
public:
PrepaidXMLRPC();

4
apps/xmlrpc2di/xmlrpc++/src/XmlRpcValue.cpp
Unescape View File

@ -306,7 +306,7 @@ namespace XmlRpc {
return false;
_type = TypeInt;
_value.asInt = int(ivalue);
_value.asInt = ivalue;
*offset += valueEnd - valueStart;
return true;
}
@ -314,7 +314,7 @@ namespace XmlRpc {
std::string XmlRpcValue::intToXml() const
{
char buf[256];
snprintf(buf, sizeof(buf)-1, "%d", _value.asInt);
snprintf(buf, sizeof(buf)-1, "%ld", _value.asInt);
buf[sizeof(buf)-1] = 0;
std::string xml = VALUE_TAG;
xml += I4_TAG;

16
apps/xmlrpc2di/xmlrpc++/src/XmlRpcValue.h
Unescape View File

@ -30,7 +30,7 @@ namespace XmlRpc {
enum Type {
TypeInvalid,
TypeBoolean,
TypeInt,
TypeInt, // really a long
TypeDouble,
TypeString,
TypeDateTime,
@ -52,8 +52,9 @@ namespace XmlRpc {
//! Construct an XmlRpcValue with a bool value
XmlRpcValue(bool value) : _type(TypeBoolean) { _value.asBool = value; }
//! Construct an XmlRpcValue with an int value
XmlRpcValue(int value) : _type(TypeInt) { _value.asInt = value; }
//! Construct an XmlRpcValue with a long value
XmlRpcValue(long value) : _type(TypeInt) { _value.asInt = value; }
XmlRpcValue(int value) : _type(TypeInt) { _value.asInt = value; }
//! Construct an XmlRpcValue with a double value
XmlRpcValue(double value) : _type(TypeDouble) { _value.asDouble = value; }
@ -98,8 +99,9 @@ namespace XmlRpc {
//! @param rhs The value in rhs is copied to this value.
XmlRpcValue& operator=(XmlRpcValue const& rhs);
//! Assign an int to this XmlRpcValue.
XmlRpcValue& operator=(int const& rhs) { return operator=(XmlRpcValue(rhs)); }
//! Assign a long to this XmlRpcValue.
XmlRpcValue& operator=(long const& rhs) { return operator=(XmlRpcValue(rhs)); }
XmlRpcValue& operator=(int const& rhs) { return operator=(XmlRpcValue(rhs)); }
//! Assign a double to this XmlRpcValue.
XmlRpcValue& operator=(double const& rhs) { return operator=(XmlRpcValue(rhs)); }
@ -121,7 +123,7 @@ namespace XmlRpc {
//! Treat an XmlRpcValue as an int.
//! Throws XmlRpcException if the value is initialized to
//! a type that is not TypeInt.
operator int&() { assertTypeOrInvalid(TypeInt); return _value.asInt; }
operator long&() { assertTypeOrInvalid(TypeInt); return _value.asInt; }
//! Treat an XmlRpcValue as a double.
//! Throws XmlRpcException if the value is initialized to
@ -242,7 +244,7 @@ namespace XmlRpc {
// separate ref-counted objects for more efficient copying.
union {
bool asBool;
int asInt;
long asInt;
double asDouble;
struct tm* asTime;
std::string* asString;

Write Preview
Loading…
Cancel
Save