Commit3715b90

Luca Niccolini

authored and

meta-codesync[bot]

committed

Add custom header support to H3DatagramClient

Summary: The H3DatagramClient sample binary hardcodes its HTTP request with no way to pass custom headers. This is needed for use with Meta's forward proxy, which requires X-FB-Proxy, X-FB-ProxyScheme, and X-FB-ProxyType headers. This change adds a --headers gflag that accepts comma-separated Name=Value pairs, reusing the existing CurlClient::parseHeaders() utility already used by the curl and hq samples.Reviewed By: jalopezsilvaDifferential Revision: D93680181fbshipit-source-id: 7f1600646e3d2bae638bddea049919f69964099e

1 parentbd79c0b commit3715b90Copy full SHA for 3715b90

File tree

2 files changed

+16

-1

lines changed

proxygen/httpclient/samples/H3Datagram
- CMakeLists.txt
- H3DatagramClient.cpp

2 files changed

+16

-1

lines changed

`‎proxygen/httpclient/samples/H3Datagram/CMakeLists.txt‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ target_link_libraries(`
`13`	`13`	`proxygen_h3datagram_client`
`14`	`14`	`PUBLIC`
`15`	`15`	`proxygen`
	`16`	`+ proxygencurl`
`16`	`17`	`)`
`17`	`18`	`install(`
`18`	`19`	`TARGETS proxygen_h3datagram_client`

`‎proxygen/httpclient/samples/H3Datagram/H3DatagramClient.cpp‎`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#include<folly/init/Init.h>`
`11`	`11`	`#include<folly/io/async/EventBase.h>`
`12`	`12`	`#include<folly/portability/GFlags.h>`
	`13`	`+#include<proxygen/httpclient/samples/curl/CurlClient.h>`
`13`	`14`	`#include<proxygen/httpserver/samples/hq/InsecureVerifierDangerousDoNotUseInProduction.h>`
`14`	`15`	`#include<proxygen/lib/transport/H3DatagramAsyncSocket.h>`
`15`	`16`
`@@ -25,6 +26,8 @@ DEFINE_int32(proxy_port, 6666, "Proxy port");`
`25`	`26`	`DEFINE_string(cert,"","Certificate file path");`
`26`	`27`	`DEFINE_string(key,"","Private key file path");`
`27`	`28`
	`29`	`+DEFINE_string(headers,"","List of N=V headers separated by ,");`
	`30`	`+`
`28`	`31`	`constexprsize_tkMaxReadBufferSize{1232};`
`29`	`32`
`30`	`33`	`namespace {`
`@@ -55,7 +58,13 @@ class DatagramClient`
`55`	`58`
`56`	`59`	`voidstart() {`
`57`	`60`	`CHECK(evb_->isInEventBaseThread());`
`58`		`- socket_.connect(SocketAddress(FLAGS_proxy_host, FLAGS_proxy_port));`
	`61`	`+try {`
	`62`	`+ socket_.connect(SocketAddress(FLAGS_proxy_host, FLAGS_proxy_port));`
	`63`	`+ }catch (const std::system_error& e) {`
	`64`	`+LOG(ERROR) <<"Failed to connect to" << FLAGS_proxy_host <<":"`
	`65`	`+ << FLAGS_proxy_port <<":" << e.what();`
	`66`	`+return;`
	`67`	`+ }`
`59`	`68`	`socket_.resumeRead(this);`
`60`	`69`
`61`	`70`	`sendPing();`
`@@ -162,6 +171,11 @@ int main(int argc, char* argv[]) {`
`162`	`171`	`options.httpRequest_->setMethod(proxygen::HTTPMethod::CONNECT_UDP);`
`163`	`172`	`options.httpRequest_->setURL(fmt::format("{}:{}", FLAGS_host, FLAGS_port));`
`164`	`173`	`options.httpRequest_->setMasque();`
	`174`	`+auto parsedHeaders =CurlService::CurlClient::parseHeaders(FLAGS_headers);`
	`175`	`+ parsedHeaders.forEach(`
	`176`	`+ [&options](const std::string& name,const std::string& value) {`
	`177`	`+ options.httpRequest_->getHeaders().add(name, value);`
	`178`	`+ });`
`165`	`179`	`options.certAndKey_ =std::make_pair(FLAGS_cert, FLAGS_key);`
`166`	`180`	`options.certVerifier_ = std::make_unique<`
`167`	`181`	`proxygen::InsecureVerifierDangerousDoNotUseInProduction>();`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit3715b90

File tree

2 files changed

2 files changed

`‎proxygen/httpclient/samples/H3Datagram/CMakeLists.txt‎`

`‎proxygen/httpclient/samples/H3Datagram/H3DatagramClient.cpp‎`

0 commit comments