From 6837c5ac80e3624c6dc3a82d03e50d68b2f5a989 Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Mon, 26 Oct 2026 17:13:36 +0100 Subject: Second run of making variable and function names more readable, urlencoder now matches overall naming scheme --- ot_http.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'ot_http.c') diff --git a/ot_http.c b/ot_http.c index 6bf343c..6c3332c 100644 --- a/ot_http.c +++ b/ot_http.c @@ -27,7 +27,7 @@ #include "ot_scan.h" #include "ot_fdstate.h" #include "ot_stats.h" -#include "scan_urlencoded_query.h" +#include "ot_urlencoded.h" #include "trackerlogic.h" #define OT_MAXMULTISCRAPE_COUNT 64 @@ -257,21 +257,21 @@ static ssize_t http_handle_stats(const int64_t sock, struct ot_workstruct *ws, c #endif while (scanon) { - switch (scan_find_keywords(keywords_main, &read_ptr, SCAN_SEARCHPATH_PARAM)) { + switch (urlencoded_match_keyword(keywords_main, &read_ptr, SCAN_SEARCHPATH_PARAM)) { case -2: scanon = 0; break; /* TERMINATOR */ case -1: HTTPERROR_400_PARAM; /* PARSE ERROR */ case -3: - scan_urlencoded_skipvalue(&read_ptr); + urlencoded_skip_value(&read_ptr); break; case 1: /* matched "mode" */ - if ((mode = scan_find_keywords(keywords_mode, &read_ptr, SCAN_SEARCHPATH_VALUE)) <= 0) + if ((mode = urlencoded_match_keyword(keywords_mode, &read_ptr, SCAN_SEARCHPATH_VALUE)) <= 0) HTTPERROR_400_PARAM; break; case 2: /* matched "format" */ - if ((format = scan_find_keywords(keywords_format, &read_ptr, SCAN_SEARCHPATH_VALUE)) <= 0) + if ((format = urlencoded_match_keyword(keywords_format, &read_ptr, SCAN_SEARCHPATH_VALUE)) <= 0) HTTPERROR_400_PARAM; break; case 3: @@ -418,18 +418,18 @@ static ssize_t http_handle_scrape(const int64_t sock, struct ot_workstruct *ws, } while (scanon) { - switch (scan_find_keywords(keywords_scrape, &read_ptr, SCAN_SEARCHPATH_PARAM)) { + switch (urlencoded_match_keyword(keywords_scrape, &read_ptr, SCAN_SEARCHPATH_PARAM)) { case -2: scanon = 0; break; /* TERMINATOR */ default: HTTPERROR_400_PARAM; /* PARSE ERROR */ case -3: - scan_urlencoded_skipvalue(&read_ptr); + urlencoded_skip_value(&read_ptr); break; case 1: /* matched "info_hash" */ /* ignore this, when we have less than 20 bytes */ - if (scan_urlencoded_query(&read_ptr, (char *)(multiscrape_buf + numwant++), SCAN_SEARCHPATH_VALUE) != (ssize_t)sizeof(ot_hash)) + if (urlencoded_parse(&read_ptr, (char *)(multiscrape_buf + numwant++), SCAN_SEARCHPATH_VALUE) != (ssize_t)sizeof(ot_hash)) HTTPERROR_400_PARAM; break; } @@ -518,24 +518,24 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct scanon = 1; while (scanon) { - switch (scan_find_keywords(keywords_announce, &read_ptr, SCAN_SEARCHPATH_PARAM)) { + switch (urlencoded_match_keyword(keywords_announce, &read_ptr, SCAN_SEARCHPATH_PARAM)) { case -2: scanon = 0; break; /* TERMINATOR */ case -1: HTTPERROR_400_PARAM; /* PARSE ERROR */ case -3: - scan_urlencoded_skipvalue(&read_ptr); + urlencoded_skip_value(&read_ptr); break; case 1: /* matched "port" */ - len = scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE); + len = urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE); if ((len <= 0) || scan_fixed_int(write_ptr, len, &tmp) || (tmp > 0xffff)) HTTPERROR_400_PARAM; port = htons(tmp); OT_SETPORT(&ws->peer, &port); break; case 2: /* matched "left" */ - if ((len = scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE)) <= 0) + if ((len = urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE)) <= 0) HTTPERROR_400_PARAM; if (scan_fixed_int(write_ptr, len, &tmp)) tmp = 0; @@ -543,7 +543,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct OT_PEERFLAG(&ws->peer) |= PEER_FLAG_SEEDING; break; case 3: /* matched "event" */ - switch (scan_find_keywords(keywords_announce_event, &read_ptr, SCAN_SEARCHPATH_VALUE)) { + switch (urlencoded_match_keyword(keywords_announce_event, &read_ptr, SCAN_SEARCHPATH_VALUE)) { case -1: HTTPERROR_400_PARAM; case 1: /* matched "completed" */ @@ -557,7 +557,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct } break; case 4: /* matched "numwant" */ - len = scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE); + len = urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE); if ((len <= 0) || scan_fixed_int(write_ptr, len, &tmp)) HTTPERROR_400_PARAM; if (tmp < 0) @@ -567,7 +567,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct numwant = tmp; break; case 5: /* matched "compact" */ - len = scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE); + len = urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE); if ((len <= 0) || scan_fixed_int(write_ptr, len, &tmp)) HTTPERROR_400_PARAM; if (!tmp) @@ -577,7 +577,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct if (ws->hash) HTTPERROR_400_DOUBLEHASH; /* ignore this, when we have less than 20 bytes */ - if (scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE) != 20) + if (urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE) != 20) HTTPERROR_400_PARAM; ws->hash = (ot_hash *)write_ptr; break; @@ -585,7 +585,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct case 7: /* matched "ip" */ { char *tmp_buf1 = ws->reply, *tmp_buf2 = ws->reply + 16; - len = scan_urlencoded_query(&read_ptr, tmp_buf2, SCAN_SEARCHPATH_VALUE); + len = urlencoded_parse(&read_ptr, tmp_buf2, SCAN_SEARCHPATH_VALUE); tmp_buf2[len] = 0; if ((len <= 0) || !ip_scan(tmp_buf2, tmp_buf1)) HTTPERROR_400_PARAM; @@ -601,7 +601,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct uint64_t value; signed short parsed, bits; - len = scan_urlencoded_query(&read_ptr, tmp_buf, SCAN_SEARCHPATH_VALUE); + len = urlencoded_parse(&read_ptr, tmp_buf, SCAN_SEARCHPATH_VALUE); tmp_buf[len] = 0; if (len <= 0) HTTPERROR_400_PARAM; @@ -630,7 +630,7 @@ static ssize_t http_handle_announce(const int64_t sock, struct ot_workstruct #endif case 9: /* matched "peer_id" */ /* ignore this, when we have less than 20 bytes */ - if (scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE) != 20) + if (urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_SEARCHPATH_VALUE) != 20) HTTPERROR_400_PARAM; ws->peer_id = write_ptr; break; @@ -709,7 +709,7 @@ ssize_t http_handle_request(const int64_t sock, struct ot_workstruct *ws) { In reality we abandoned requiring the url to be correct. This now only decodes url encoded characters, we check for announces and scrapes by looking for "a*" or "sc" */ - len = scan_urlencoded_query(&read_ptr, write_ptr = read_ptr, SCAN_PATH); + len = urlencoded_parse(&read_ptr, write_ptr = read_ptr, SCAN_PATH); /* If parsing returned an error, leave with not found */ if (g_redirecturl && (len == -2)) -- cgit v1.3