jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add const char * option and allow parameters to address without vhost

This commit is contained in:
Michael van der Werve 2020-09-29 12:04:09 +02:00
parent 18d4a2cd56
commit 66faa8a925
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/amqpcpp/address.h
View File

@ -123,14 +123,18 @@ public:
// find out where the vhost is set (starts with a slash) // find out where the vhost is set (starts with a slash)
const char *slash = (const char *)memchr(data, '/', last - data); const char *slash = (const char *)memchr(data, '/', last - data);
// if there is a slash, we search for the ? for extra options // where to start looking for the question mark, we also want to support urls where the
const char *qm = static_cast<const char *>(slash ? memchr(slash, '?', last - slash) : nullptr); // hostname does not have a slash.
const char *start = slash ? slash : data;
// we search for the ? for extra options
const char *qm = static_cast<const char *>(memchr(start, '?', last - start));
// if there is a questionmark, we need to parse all options // if there is a questionmark, we need to parse all options
if (qm != nullptr && last - qm > 1) if (qm != nullptr && last - qm > 1)
{ {
// we start at the question mark // we start at question mark now
const char *start = qm; start = qm;
do { do {
// find the next equals sign and start of the next parameter // find the next equals sign and start of the next parameter
@ -140,7 +144,7 @@ public:
// assign it to the options if we found an equals sign // assign it to the options if we found an equals sign
if (equals) _options[std::string(start + 1, equals - start - 1)] = std::string(equals + 1, (next ? next - equals : last - equals) - 1); if (equals) _options[std::string(start + 1, equals - start - 1)] = std::string(equals + 1, (next ? next - equals : last - equals) - 1);
// we now have a new start // we now have a new start, the next '&...'
start = next; start = next;
// keep iterating as long as there are more vars // keep iterating as long as there are more vars
@ -276,7 +280,7 @@ public:
str.append("/"); str.append("/");
// do we have a special vhost? // do we have a special vhost?
if (_vhost != "/" || !_options.empty()) str.append(_vhost); if (_vhost != "/") str.append(_vhost);
// iterate over all options, appending them // iterate over all options, appending them
if (!_options.empty()) if (!_options.empty())
@ -385,7 +389,7 @@ public:
stream << "/"; stream << "/";
// do we have a special vhost or options? // do we have a special vhost or options?
if (address._vhost != "/" || !address._options.empty()) stream << address._vhost; if (address._vhost != "/") stream << address._vhost;
// iterate over all options, appending them // iterate over all options, appending them
if (!address._options.empty()) if (!address._options.empty())
@ -419,15 +423,28 @@ public:
*/ */
template <typename T, typename std::enable_if<std::is_integral<T>::value>::type* = nullptr> template <typename T, typename std::enable_if<std::is_integral<T>::value>::type* = nullptr>
T option(const char *name, T fallback) const T option(const char *name, T fallback) const
{
// find the const char* version of the option
const char *value = option(name);
// if there is a value, convert it to integral, otherwise return the fallback
return value ? static_cast<T>(atoll(value)) : fallback;
}
/**
* Get a const char * option, returns nullptr if it does not exist.
* @return const char *
*/
const char *option(const char *name) const
{ {
// find the option // find the option
auto iter = _options.find(name); auto iter = _options.find(name);
// if not found, we return the default // if not found, we return the default
if (iter == _options.end()) return fallback; if (iter == _options.end()) return nullptr;
// return the value in the map // return the value in the map
return static_cast<T>(atoll(iter->second.c_str())); return iter->second.c_str();
} }
}; };