Compare commits

...

3 Commits

Author SHA1 Message Date
54374082f4 Started IPv6 support [WIP] 2023-02-24 08:11:46 -06:00
7dce5bbaa1 Added 'allwarn' target to Makefile 2023-02-24 08:11:33 -06:00
80263cb92e Updated .gitignore 2023-02-24 08:11:19 -06:00
3 changed files with 26 additions and 6 deletions

2
.gitignore vendored
View File

@@ -1,3 +1,3 @@
proxy basicproxy
main.o main.o
easysock.o easysock.o

View File

@@ -1,11 +1,12 @@
CC=gcc CC=gcc
CFLAGS= CFLAGS=
EXEC_FILE=proxy EXEC_FILE=basicproxy
$(EXEC_FILE): main.o easysock.o $(EXEC_FILE): main.o easysock.o
$(CC) $(CFLAGS) main.o easysock.o -o $(EXEC_FILE) $(CC) $(CFLAGS) main.o easysock.o -o $(EXEC_FILE)
allwarn: CFLAGS+=-Wall allwarn: CFLAGS+=-Wall -Wextra -pedantic
allwarn: $(EXEC_FILE) allwarn: $(EXEC_FILE)
clean: $(EXEC_FILE) main.o easysock.o clean: $(EXEC_FILE) main.o easysock.o

25
main.c
View File

@@ -12,6 +12,18 @@ void forward_data(int from_fd, int to_fd) {
} }
} }
int check_ip_ver(char* address) {
char buffer[16]; /* 16 chars - 128 bits - is enough to hold an ipv6 address */
if (inet_pton(AF_INET,address,buffer) == 1) {
return 4;
} else if (inet_pton(AF_INET6,address,buffer) == 1) {
return 6;
} else {
return -1;
}
}
int main(int argc,char* argv[]) { int main(int argc,char* argv[]) {
/* argv[1] = local address /* argv[1] = local address
@@ -24,10 +36,17 @@ int main(int argc,char* argv[]) {
char* remote_addr = argv[3]; char* remote_addr = argv[3];
int remote_port = strtol(argv[4],NULL,10); int remote_port = strtol(argv[4],NULL,10);
int preferred_network = 4; int preferred_local_network = check_ip_ver(local_addr);
int preferred_remote_network = check_ip_ver(remote_addr);
printf("Using %d for local\nUsing %d for remote\n",preferred_local_network,preferred_remote_network);
if ((preferred_local_network == -1) && (preferred_remote_network == -1)) {
exit(-7);
}
char preferred_transport = 'T'; char preferred_transport = 'T';
struct sockaddr addr_struct; struct sockaddr addr_struct;
int server_sock = create_local(preferred_network,preferred_transport,local_addr,local_port,&addr_struct); int server_sock = create_local(preferred_local_network,preferred_transport,local_addr,local_port,&addr_struct);
int addrlen = sizeof(addr_struct); int addrlen = sizeof(addr_struct);
listen(server_sock,50); /* Arbitrary number, change later */ listen(server_sock,50); /* Arbitrary number, change later */
@@ -35,7 +54,7 @@ int main(int argc,char* argv[]) {
printf("Listening on %s:%d\n",local_addr,local_port); printf("Listening on %s:%d\n",local_addr,local_port);
while (1) { while (1) {
int from_client = accept(server_sock,&addr_struct,(socklen_t *)&addrlen); int from_client = accept(server_sock,&addr_struct,(socklen_t *)&addrlen);
int to_server = create_remote(preferred_network,preferred_transport,remote_addr,remote_port); int to_server = create_remote(preferred_remote_network,preferred_transport,remote_addr,remote_port);
printf("Connection established to %s:%d\n",remote_addr,remote_port); printf("Connection established to %s:%d\n",remote_addr,remote_port);
if (fork() == 0) { if (fork() == 0) {