Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: parse port like we do in fetch-tls

This commit is contained in:
K. Lange 2021-06-19 15:36:43 +09:00
parent 653d6a7035
commit c8c5ab1db8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/fetch.c
View File

@ -24,6 +24,7 @@
struct http_req {
char domain[SIZE];
char path[SIZE];
int port;
};
struct {
@ -45,7 +46,6 @@ struct {
void parse_url(char * d, struct http_req * r) {
if (strstr(d, "http://") == d) {
d += strlen("http://");
char * s = strstr(d, "/");
@ -58,6 +58,14 @@ void parse_url(char * d, struct http_req * r) {
strcpy(r->domain, d);
strcpy(r->path, s);
}
if (strstr(r->domain,":")) {
char * port = strstr(r->domain,":");
*port = '\0';
port++;
r->port = atoi(port);
} else {
r->port = 80;
}
} else {
fprintf(stderr, "sorry, can't parse %s\n", d);
exit(1);
@ -320,7 +328,7 @@ int main(int argc, char * argv[]) {
struct sockaddr_in addr;
addr.sin_family = AF_INET;
memcpy(&addr.sin_addr.s_addr, remote->h_addr, remote->h_length);
addr.sin_port = htons(80); /* TODO */
addr.sin_port = htons(my_req.port);
if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr_in)) < 0) {
perror("connect");