commit d9f6c621036162e9071ce3c3a333b4544c6db870
author Ed Tanous <edtanous@google.com> Thu Mar 17 09:12:17 2022 -0700
committer Ed Tanous <ed@tanous.net> Sat Aug 06 17:30:15 2022 +0000
tree d398d7e98cad67243f5d54ecefc1f787a47306a3
parent 5907571df69a5e1a6f3e0633ad42f2dc7fa6ba25

Use enum overload for field setting

There are two overloads of addHeader, one that takes a string, and one
that takes a boost enum.  For most common headers, boost contains a
string table with all of those entries anyway, so there's no point in
duplicating the strings, and ensures that we don't make trivial
mistakes, like capitalization or - versus underscore that aren't caught
at compile time.

Tested:
This saves a trivial amount (572 bytes) of compressed binary size.

curl --insecure -vvv --user root:0penBmc https://192.168.7.2/redfish/v1

returns < Content-Type: application/json

curl --insecure -vvv -H "Accept: text/html" --user root:0penBmc https://192.168.7.2/redfish/v1

Returns
< Content-Type: text/html;charset=UTF-8

Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I34c198b4f9e219247fcfe719f9b3616d35aea3dc

include/forward_unauthorized.hpp

diff --git a/include/forward_unauthorized.hpp b/include/forward_unauthorized.hpp
index ddf3e3b..a48b775 100644
--- a/include/forward_unauthorized.hpp
+++ b/include/forward_unauthorized.hpp
@@ -20,7 +20,7 @@
         if (hasWebuiRoute)
         {
             res.result(boost::beast::http::status::temporary_redirect);
-            res.addHeader("Location",
+            res.addHeader(boost::beast::http::field::location,
                           "/#/login?next=" + http_helpers::urlEncode(url));
             return;
         }
@@ -46,6 +46,6 @@
     {
         return;
     }
-    res.addHeader("WWW-Authenticate", "Basic");
+    res.addHeader(boost::beast::http::field::www_authenticate, "Basic");
 }
 } // namespace forward_unauthorized

include/ibm/management_console_rest.hpp

diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp
index 0d8e287..7396ce6 100644
--- a/include/ibm/management_console_rest.hpp
+++ b/include/ibm/management_console_rest.hpp
@@ -321,7 +321,8 @@
 
     std::string contentDispositionParam =
         "attachment; filename=\"" + fileID + "\"";
-    asyncResp->res.addHeader("Content-Disposition", contentDispositionParam);
+    asyncResp->res.addHeader(boost::beast::http::field::content_disposition,
+                             contentDispositionParam);
     std::string fileData;
     fileData = {std::istreambuf_iterator<char>(readfile),
                 std::istreambuf_iterator<char>()};

include/openbmc_dbus_rest.hpp

diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index 9c8d9f5..f458fac 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -2547,7 +2547,7 @@
                 continue;
             }
 
-            asyncResp->res.addHeader("Content-Type",
+            asyncResp->res.addHeader(boost::beast::http::field::content_type,
                                      "application/octet-stream");
 
             // Assuming only one dump file will be present in the dump
@@ -2567,8 +2567,9 @@
             std::string contentDispositionParam =
                 "attachment; filename=\"" + dumpFileName + "\"";
 
-            asyncResp->res.addHeader("Content-Disposition",
-                                     contentDispositionParam);
+            asyncResp->res.addHeader(
+                boost::beast::http::field::content_disposition,
+                contentDispositionParam);
 
             asyncResp->res.body() = {std::istreambuf_iterator<char>(readFile),
                                      std::istreambuf_iterator<char>()};

include/webassets.hpp

diff --git a/include/webassets.hpp b/include/webassets.hpp
index 3d25296..cd57eb3 100644
--- a/include/webassets.hpp
+++ b/include/webassets.hpp
@@ -152,13 +152,15 @@
                     const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) {
                 if (contentType != nullptr)
                 {
-                    asyncResp->res.addHeader("Content-Type", contentType);
+                    asyncResp->res.addHeader(
+                        boost::beast::http::field::content_type, contentType);
                 }
 
                 if (contentEncoding != nullptr)
                 {
-                    asyncResp->res.addHeader("Content-Encoding",
-                                             contentEncoding);
+                    asyncResp->res.addHeader(
+                        boost::beast::http::field::content_encoding,
+                        contentEncoding);
                 }
 
                 // res.set_header("Cache-Control", "public, max-age=86400");