Set UserAgent

Author: attah

lib/curlrequester.cpp

@@ -27,10 +27,11 @@ CurlRequester::CurlRequester(const Url& addr, const SslConfig& sslConfig)
     curl_easy_setopt(_curl, CURLOPT_PINNEDPUBLICKEY, sslConfig.pinnedPublicKey.c_str());
   }
 
-  _opts = nullptr;
-#ifdef USER_AGENT
-  _opts = curl_slist_append(_opts, "User-Agent: " USER_AGENT);
-#endif
+  if(!_userAgent.empty())
+  {
+    std::string userAgentOpt = "User-Agent: " + _userAgent;
+    _opts = curl_slist_append(_opts, userAgentOpt.c_str());
+  }
 
 }
 
@@ -67,6 +68,13 @@ CURLcode CurlRequester::await(Bytestream* data)
   return _result;
 }
 
+void CurlRequester::setUserAgent(std::string userAgent)
+{
+  _userAgent = std::move(userAgent);
+}
+
+std::string CurlRequester::_userAgent;
+
 CurlIppPosterBase::~CurlIppPosterBase()
 {
   CurlIppPosterBase::await();

lib/curlrequester.h

@@ -9,10 +9,6 @@
 #include <zlib.h>
 #include <mutex>
 
-#ifndef USER_AGENT
-#define USER_AGENT ""
-#endif
-
 class CurlRequester
 {
 public:
@@ -30,6 +26,8 @@ class CurlRequester
 
   virtual CURLcode await(Bytestream* = nullptr);
 
+  static void setUserAgent(std::string userAgent);
+
 protected:
 
   CurlRequester(const Url& addr, const SslConfig& sslConfig);
@@ -70,6 +68,8 @@ class CurlRequester
   struct curl_slist* _opts = nullptr;
 
   LThread _worker;
+
+  static std::string _userAgent;
 };
 
 class CurlIppPosterBase : public CurlRequester

utils/ippclient.cpp

@@ -308,6 +308,8 @@ int main(int argc, char** argv)
     return 1;
   }
 
+  CurlRequester::setUserAgent("ppm2pwg-ippclient");
+
   IppPrinter printer(addr, {verifySsl, pinnedPublicKey});
   Error error = printer.error();
   if(error)