diff options
| -rw-r--r-- | userland/libc/Makefile | 2 | ||||
| -rw-r--r-- | userland/libc/include/netdb.h | 12 | ||||
| -rw-r--r-- | userland/libc/netdb/gai_strerror.c | 36 | ||||
| -rw-r--r-- | userland/libc/netdb/getaddrinfo.c | 6 |
4 files changed, 50 insertions, 6 deletions
diff --git a/userland/libc/Makefile b/userland/libc/Makefile index e56f2cf..204d0b4 100644 --- a/userland/libc/Makefile +++ b/userland/libc/Makefile @@ -2,7 +2,7 @@ CC="i686-sb-gcc" AR="i686-sb-ar" AS="i686-sb-as" CFLAGS = -ggdb -ffreestanding -O2 -Wall -Wextra -pedantic -Werror -Wimplicit-fallthrough -I./include/ -static -I../../include/ -Wno-int-conversion -Wno-unused-parameter -OBJ=crt1.o crti.o crtn.o libc.o malloc/malloc.o pty.o sys/mman/mmap.o sys/mman/munmap.o memset.o assert.o stdio/snprintf.o stdio/vfprintf.o string/memcpy.o string/memcmp.o string/strcmp.o ubsan.o string/strcpy.o isspace.o stdio/puts.o stdio/putchar.o dirent/opendir.o dirent/readdir.o dirent/closedir.o unistd/getopt.o dirent/scandir.o dirent/alphasort.o stdio/printf.o stdio/vdprintf.o stdio/vprintf.o stdio/dprintf.o stdio/vprintf.o string/strlen.o string/strnlen.o stdio/stdin.o stdio/getchar.o stdio/fgetc.o arpa/inet/htons.o arpa/inet/htonl.o stdio/fread.o stdio/fwrite.o stdio/fopen.o stdio/fclose.o stdio/fseek.o ctype/isascii.o stdio/fprintf.o stdlib/atoi.o stdlib/strtol.o ctype/toupper.o ctype/tolower.o string/strcat.o string/strchr.o string/sscanf.o sys/stat/stat.o stdlib/getenv.o string/strrchr.o stdio/ftell.o stdio/tmpfile.o stdio/fgets.o stdio/feof.o stdio/fscanf.o stdio/ungetc.o string/strncmp.o stdio/fputc.o string/strncpy.o stdio/remove.o stdio/ferror.o stdio/fputs.o stdlib/rand.o stdlib/srand.o unistd/getpid.o stdlib/strtoul.o stdio/fflush.o stdlib/abort.o string/strcspn.o time/localtime.o time/time.o time/clock_gettime.o time/gmtime.o time/strftime.o string/strpbrk.o ctype/isdigit.o ctype/isalpha.o ctype/isxdigit.o ctype/ispunct.o stdio/setvbuf.o stdio/fileno.o stdio/putc.o stdio/sprintf.o stdlib/abs.o string/strspn.o stdlib/qsort.o string/memmove.o setjmp/longjmp.o setjmp/setjmp.o libgen/basename.o string/strdup.o string/strndup.o string/strlcpy.o stdlib/atexit.o stdio/open_memstream.o libgen/dirname.o unistd/unlink.o string/strstr.o string/strcasecmp.o string/strncasecmp.o stdlib/mkstemp.o string/strtok.o unistd/execvp.o unistd/_exit.o ctype/isalnum.o time/ctime_r.o stdlib/strtold.o sys/time/gettimeofday.o stdio/fgetpos.o stdio/fsetpos.o ctype/isprint.o stdlib/system.o stdio/tmpnam.o unistd/msleep.o stdlib/atof.o stdlib/strtod.o stdio/rename.o sys/stat/mkdir.o unistd/uptime.o unistd/ftruncate.o sys/socket/recvfrom.o sys/socket/sendto.o signal/kill.o signal/sigaction.o unistd/chdir.o unistd/getcwd.o stdio/getdelim.o stdio/getline.o unistd/isatty.o sys/socket/listen.o stdlib/realpath.o systemcall.o sys/random/randomfill.o fcntl/open.o unistd/write.o unistd/pwrite.o tb/sb.o tb/sv.o string/memchr.o stdlib/atol.o stdlib/atoll.o stdlib/strtoll.o sys/stat/fstat.o unistd/lseek.o ctype/isupper.o ctype/islower.o ctype/isblank.o ctype/isgraph.o ctype/iscntrl.o math/ldexp.o sys/socket/connect.o sys/socket/setsockopt.o arpa/inet/ntohl.o arpa/inet/ntohs.o netdb/getaddrinfo.o tb/sha1.o sys/socket/getpeername.o fcntl/fcntl.o queue.o sys/sendfile.o stdio/fdopen.o unistd/dup.o stdlib/setenv.o +OBJ=crt1.o crti.o crtn.o libc.o malloc/malloc.o pty.o sys/mman/mmap.o sys/mman/munmap.o memset.o assert.o stdio/snprintf.o stdio/vfprintf.o string/memcpy.o string/memcmp.o string/strcmp.o ubsan.o string/strcpy.o isspace.o stdio/puts.o stdio/putchar.o dirent/opendir.o dirent/readdir.o dirent/closedir.o unistd/getopt.o dirent/scandir.o dirent/alphasort.o stdio/printf.o stdio/vdprintf.o stdio/vprintf.o stdio/dprintf.o stdio/vprintf.o string/strlen.o string/strnlen.o stdio/stdin.o stdio/getchar.o stdio/fgetc.o arpa/inet/htons.o arpa/inet/htonl.o stdio/fread.o stdio/fwrite.o stdio/fopen.o stdio/fclose.o stdio/fseek.o ctype/isascii.o stdio/fprintf.o stdlib/atoi.o stdlib/strtol.o ctype/toupper.o ctype/tolower.o string/strcat.o string/strchr.o string/sscanf.o sys/stat/stat.o stdlib/getenv.o string/strrchr.o stdio/ftell.o stdio/tmpfile.o stdio/fgets.o stdio/feof.o stdio/fscanf.o stdio/ungetc.o string/strncmp.o stdio/fputc.o string/strncpy.o stdio/remove.o stdio/ferror.o stdio/fputs.o stdlib/rand.o stdlib/srand.o unistd/getpid.o stdlib/strtoul.o stdio/fflush.o stdlib/abort.o string/strcspn.o time/localtime.o time/time.o time/clock_gettime.o time/gmtime.o time/strftime.o string/strpbrk.o ctype/isdigit.o ctype/isalpha.o ctype/isxdigit.o ctype/ispunct.o stdio/setvbuf.o stdio/fileno.o stdio/putc.o stdio/sprintf.o stdlib/abs.o string/strspn.o stdlib/qsort.o string/memmove.o setjmp/longjmp.o setjmp/setjmp.o libgen/basename.o string/strdup.o string/strndup.o string/strlcpy.o stdlib/atexit.o stdio/open_memstream.o libgen/dirname.o unistd/unlink.o string/strstr.o string/strcasecmp.o string/strncasecmp.o stdlib/mkstemp.o string/strtok.o unistd/execvp.o unistd/_exit.o ctype/isalnum.o time/ctime_r.o stdlib/strtold.o sys/time/gettimeofday.o stdio/fgetpos.o stdio/fsetpos.o ctype/isprint.o stdlib/system.o stdio/tmpnam.o unistd/msleep.o stdlib/atof.o stdlib/strtod.o stdio/rename.o sys/stat/mkdir.o unistd/uptime.o unistd/ftruncate.o sys/socket/recvfrom.o sys/socket/sendto.o signal/kill.o signal/sigaction.o unistd/chdir.o unistd/getcwd.o stdio/getdelim.o stdio/getline.o unistd/isatty.o sys/socket/listen.o stdlib/realpath.o systemcall.o sys/random/randomfill.o fcntl/open.o unistd/write.o unistd/pwrite.o tb/sb.o tb/sv.o string/memchr.o stdlib/atol.o stdlib/atoll.o stdlib/strtoll.o sys/stat/fstat.o unistd/lseek.o ctype/isupper.o ctype/islower.o ctype/isblank.o ctype/isgraph.o ctype/iscntrl.o math/ldexp.o sys/socket/connect.o sys/socket/setsockopt.o arpa/inet/ntohl.o arpa/inet/ntohs.o netdb/getaddrinfo.o tb/sha1.o sys/socket/getpeername.o fcntl/fcntl.o queue.o sys/sendfile.o stdio/fdopen.o unistd/dup.o stdlib/setenv.o netdb/gai_strerror.o all: libc.a %.o: %.c diff --git a/userland/libc/include/netdb.h b/userland/libc/include/netdb.h index 4b4dc99..5a613df 100644 --- a/userland/libc/include/netdb.h +++ b/userland/libc/include/netdb.h @@ -1,7 +1,19 @@ #include <arpa/inet.h> #include <sys/socket.h> +#define EAI_AGAIN -1 +#define EAI_BADFLAGS -2 +#define EAI_FAIL -3 +#define EAI_FAMILY -4 +#define EAI_MEMORY -5 +#define EAI_NONAME -6 +#define EAI_SERVICE -7 +#define EAI_SOCKTYPE -8 +#define EAI_SYSTEM -9 +#define EAI_OVERFLOW -10 + int getaddrinfo(const char *restrict node, const char *restrict service, const struct addrinfo *restrict hints, struct addrinfo **restrict res); void freeaddrinfo(struct addrinfo *res); +const char *gai_strerror(int errcode); diff --git a/userland/libc/netdb/gai_strerror.c b/userland/libc/netdb/gai_strerror.c new file mode 100644 index 0000000..81457cb --- /dev/null +++ b/userland/libc/netdb/gai_strerror.c @@ -0,0 +1,36 @@ +#include <assert.h> +#include <netdb.h> +#include <sys/socket.h> +#include <sys/types.h> + +const char *gai_strerror(int errcode) { + switch (errcode) { + case EAI_AGAIN: + return "The name could not be resolved at this time. Future attempts may " + "succeed."; + case EAI_BADFLAGS: + return "The flags had an invalid value."; + case EAI_FAIL: + return "A non-recoverable error occurred."; + case EAI_FAMILY: + return "The address family was not recognized or the address length was " + "invalid for the specified family."; + case EAI_MEMORY: + return "There was a memory allocation failure."; + case EAI_NONAME: + return "The name does not resolve for the supplied parameters. NI_NAMEREQD " + "is set and the host's name cannot be located, or both nodename and " + "servname were null."; + case EAI_SERVICE: + return "The service passed was not recognized for the specified socket " + "type."; + case EAI_SOCKTYPE: + return "The intended socket type was not recognized."; + case EAI_SYSTEM: + return "A system error occurred. The error code can be found in errno."; + case EAI_OVERFLOW: + return "An argument buffer overflowed."; + default: + return "Invalid gai error code, no error string found."; + } +} diff --git a/userland/libc/netdb/getaddrinfo.c b/userland/libc/netdb/getaddrinfo.c index f7e89c0..f19d11a 100644 --- a/userland/libc/netdb/getaddrinfo.c +++ b/userland/libc/netdb/getaddrinfo.c @@ -1,6 +1,7 @@ #include <arpa/inet.h> #include <assert.h> #include <ctype.h> +#include <netdb.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -88,11 +89,6 @@ int connect_dns(void) { hints.ai_next = NULL; */ -#define EAI_AGAIN 1 -#define EAI_FAIL 2 -#define EAI_NONAME 3 -#define EAI_MEMORY 4 - u16 service_to_port(const char *service) { int is_number = 0; for (int i = 0; service[i]; i++) { |