Re: rpki-client add http_proxy support

2021-09-01 Thread Claudio Jeker
On Wed, Sep 01, 2021 at 09:38:55AM +, Job Snijders wrote:
> On Tue, Aug 31, 2021 at 09:58:54AM +0200, Claudio Jeker wrote:
> > This diff improves the http code by a) adding an IO timeout and b)
> > implementing http_proxy support.
> > 
> > Works for me using tinyproxy as proxy server.
> 
> OK?

Already fixed :)
 
> Index: http.c
> ===
> RCS file: /cvs/src/usr.sbin/rpki-client/http.c,v
> retrieving revision 1.37
> diff -u -p -r1.37 http.c
> --- http.c1 Sep 2021 08:09:41 -   1.37
> +++ http.c1 Sep 2021 09:38:29 -
> @@ -658,7 +658,7 @@ http_new(struct http_request *req)
>   LIST_INSERT_HEAD(&active, conn, entry);
>   http_conn_count++;
>  
> - if (proxy.proxyhost == NULL) {
> + if (proxy.proxyhost != NULL) {
>   if (http_resolv(&conn->res0, proxy.proxyhost,
>   proxy.proxyport) == -1) {
>   http_req_fail(req->id);
> @@ -796,7 +796,7 @@ http_connect_done(struct http_connection
>   conn->res0 = NULL;
>   conn->res = NULL;
>  
> - if (proxy.proxyhost == NULL)
> + if (proxy.proxyhost != NULL)
>   return proxy_connect(conn);
>   return http_tls_connect(conn);
>  }
> 

-- 
:wq Claudio



Re: rpki-client add http_proxy support

2021-09-01 Thread Job Snijders
On Tue, Aug 31, 2021 at 09:58:54AM +0200, Claudio Jeker wrote:
> This diff improves the http code by a) adding an IO timeout and b)
> implementing http_proxy support.
> 
> Works for me using tinyproxy as proxy server.

OK?

Index: http.c
===
RCS file: /cvs/src/usr.sbin/rpki-client/http.c,v
retrieving revision 1.37
diff -u -p -r1.37 http.c
--- http.c  1 Sep 2021 08:09:41 -   1.37
+++ http.c  1 Sep 2021 09:38:29 -
@@ -658,7 +658,7 @@ http_new(struct http_request *req)
LIST_INSERT_HEAD(&active, conn, entry);
http_conn_count++;
 
-   if (proxy.proxyhost == NULL) {
+   if (proxy.proxyhost != NULL) {
if (http_resolv(&conn->res0, proxy.proxyhost,
proxy.proxyport) == -1) {
http_req_fail(req->id);
@@ -796,7 +796,7 @@ http_connect_done(struct http_connection
conn->res0 = NULL;
conn->res = NULL;
 
-   if (proxy.proxyhost == NULL)
+   if (proxy.proxyhost != NULL)
return proxy_connect(conn);
return http_tls_connect(conn);
 }