diff options
| author | Marvin Borner | 2020-11-18 13:49:19 +0100 |
|---|---|---|
| committer | Marvin Borner | 2020-11-18 13:49:19 +0100 |
| commit | 431c88102153b8b41a15a1105e291ecf161c030e (patch) | |
| tree | 63063babd988284871db7c27dbb96025d00f2444 /apps | |
| parent | cc85ffd8a1c4703051655c7f5727157e7e1ce96a (diff) | |
Started libnet
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 4 | ||||
| -rw-r--r-- | apps/init.c | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/apps/Makefile b/apps/Makefile index 322b7b6..fd7cc99 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -6,14 +6,14 @@ LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy WARNINGS = -Wall -Wextra -pedantic-errors -Wshadow -Wpointer-arith -Wwrite-strings -Wredundant-decls -Wnested-externs -Wno-long-long -CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -fPIE -Duserspace -Ofast +CFLAGS = $(WARNINGS) -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -I../libnet/inc/ -fPIE -Duserspace -Ofast all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lc + @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lnet -lc @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) # @cp $(@:.o=.elf) ../build/apps/$(@:.o=.dbg) diff --git a/apps/init.c b/apps/init.c index 9d64388..234853f 100644 --- a/apps/init.c +++ b/apps/init.c @@ -1,7 +1,9 @@ // MIT License, Copyright (c) 2020 Marvin Borner #include <def.h> +#include <net.h> #include <print.h> +#include <str.h> #include <sys.h> int main(int argc, char **argv) @@ -13,5 +15,13 @@ int main(int argc, char **argv) int wm = exec("/bin/wm", "wm", argv[1], NULL); int exec = exec("/bin/exec", "test", NULL); + /* #define http_req "GET / HTTP/1.1\r\nHost: google.de\r\n\r\n" */ + /* struct socket *socket = net_open(S_TCP); */ + /* if (socket && net_connect(socket, ip(91, 89, 253, 227), 80)) */ + /* net_send(socket, strdup(http_req), strlen(http_req)); */ + /* else */ + /* print("Couldn't connect!\n"); */ + dns_request("google", "de"); + return wm + exec; } |