sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-08 18:30:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

[http] Rename connection retry timer

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-12-04 13:47:30 +00:00
parent 64f936d5df
commit 1a789c1daa
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/ipxe/http.h
View File

@@ -426,7 +426,7 @@ struct http_transaction {
/** Transmit process */ /** Transmit process */
struct process process; struct process process;
/** Reconnection timer */ /** Reconnection timer */
struct retry_timer timer; struct retry_timer retry;
/** Request URI */ /** Request URI */
struct uri *uri; struct uri *uri;

15
src/net/tcp/httpcore.c
View File

@@ -282,7 +282,7 @@ static void http_close ( struct http_transaction *http, int rc ) {
process_del ( &http->process ); process_del ( &http->process );
/* Stop timer */ /* Stop timer */
stop_timer ( &http->timer ); stop_timer ( &http->retry );
/* Close all interfaces */ /* Close all interfaces */
intfs_shutdown ( rc, &http->conn, &http->transfer, &http->content, intfs_shutdown ( rc, &http->conn, &http->transfer, &http->content,
@@ -332,14 +332,15 @@ static void http_reopen ( struct http_transaction *http ) {
} }
/** /**
* Handle retry timer expiry * Handle connection retry timer expiry
* *
* @v timer Retry timer * @v retry Retry timer
* @v over Failure indicator * @v over Failure indicator
*/ */
static void http_expired ( struct retry_timer *timer, int over __unused ) { static void http_retry_expired ( struct retry_timer *retry,
int over __unused ) {
struct http_transaction *http = struct http_transaction *http =
container_of ( timer, struct http_transaction, timer ); container_of ( retry, struct http_transaction, retry );
/* Reopen connection */ /* Reopen connection */
http_reopen ( http ); http_reopen ( http );
@@ -649,7 +650,7 @@ int http_open ( struct interface *xfer, struct http_method *method,
intf_init ( &http->conn, &http_conn_desc, &http->refcnt ); intf_init ( &http->conn, &http_conn_desc, &http->refcnt );
intf_plug_plug ( &http->transfer, &http->content ); intf_plug_plug ( &http->transfer, &http->content );
process_init ( &http->process, &http_process_desc, &http->refcnt ); process_init ( &http->process, &http_process_desc, &http->refcnt );
timer_init ( &http->timer, http_expired, &http->refcnt ); timer_init ( &http->retry, http_retry_expired, &http->refcnt );
http->uri = uri_get ( uri ); http->uri = uri_get ( uri );
http->request.method = method; http->request.method = method;
http->request.uri = request_uri_string; http->request.uri = request_uri_string;
@@ -809,7 +810,7 @@ static int http_transfer_complete ( struct http_transaction *http ) {
/* Start timer to initiate retry */ /* Start timer to initiate retry */
DBGC2 ( http, "HTTP %p retrying after %d seconds\n", DBGC2 ( http, "HTTP %p retrying after %d seconds\n",
http, http->response.retry_after ); http, http->response.retry_after );
start_timer_fixed ( &http->timer, start_timer_fixed ( &http->retry,
( http->response.retry_after * TICKS_PER_SEC ) ); ( http->response.retry_after * TICKS_PER_SEC ) );
return 0; return 0;
} }