mirror of
https://github.com/jart/cosmopolitan.git
synced 2025-05-23 13:52:28 +00:00
Add protoent and netent (#209)
The implementations of the getproto* functions follow from the getserv* functions: same static name allocation, same type of internal function that opens a file to search, aliases are not written to the struct, same type of error handling/returns. This changes also fixes a getaddrinfo AI_PASSIVE memory error. When getaddrinfo is passed name = NULL and AI_PASSIVE in hints->ai_flags, it was setting the s_addr value to INADDR_ANY but *not* returning the addrinfo pointer via *res = ai. This caused a free(NULL) memory error when the caller tried to free res, because the caller expects res to be a valid pointer to a struct addrinfo. Our non-standard API parseport() has been updated to use strtoimax. strtoimax has an extra parameter endptr to store where the parsing was terminated. endptr is used in parseport to check if the provided string was valid.
This commit is contained in:
Gautham
GitHub
parent
c002e4ba76
commit
e99a4dcc8c
16 changed files with 713 additions and 124 deletions
83
test/libc/dns/prototxt_test.c
Normal file
83
test/libc/dns/prototxt_test.c
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
|
||||
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
|
||||
╞══════════════════════════════════════════════════════════════════════════════╡
|
||||
│ This is free and unencumbered software released into the public domain. │
|
||||
│ │
|
||||
│ Anyone is free to copy, modify, publish, use, compile, sell, or │
|
||||
│ distribute this software, either in source code form or as a compiled │
|
||||
│ binary, for any purpose, commercial or non-commercial, and by any │
|
||||
│ means. │
|
||||
│ │
|
||||
│ In jurisdictions that recognize copyright laws, the author or authors │
|
||||
│ of this software dedicate any and all copyright interest in the │
|
||||
│ software to the public domain. We make this dedication for the benefit │
|
||||
│ of the public at large and to the detriment of our heirs and │
|
||||
│ successors. We intend this dedication to be an overt act of │
|
||||
│ relinquishment in perpetuity of all present and future rights to this │
|
||||
│ software under copyright law. │
|
||||
│ │
|
||||
│ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, │
|
||||
│ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF │
|
||||
│ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. │
|
||||
│ IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR │
|
||||
│ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, │
|
||||
│ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR │
|
||||
│ OTHER DEALINGS IN THE SOFTWARE. │
|
||||
│ │
|
||||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/dns/prototxt.h"
|
||||
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/dns/dns.h"
|
||||
#include "libc/dns/ent.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
||||
void SetUp() {
|
||||
int fd;
|
||||
const char* sample = "\
|
||||
# skip comment string\n\
|
||||
rspf 73 RSPF CPHB \n\
|
||||
ggp 3 GGP ";
|
||||
|
||||
ASSERT_NE(-1, (fd = creat("protocols", 0755)));
|
||||
ASSERT_NE(-1, write(fd, sample, strlen(sample)));
|
||||
ASSERT_NE(-1, close(fd));
|
||||
}
|
||||
|
||||
TEST(LookupProtoByNumber, GetNameWhenNumberCorrect) {
|
||||
char name[16]; /* sample has only names of length 3-4 */
|
||||
strcpy(name, "");
|
||||
|
||||
ASSERT_EQ(-1, /*non-existent number */
|
||||
LookupProtoByNumber(24, name, sizeof(name), "protocols"));
|
||||
|
||||
ASSERT_EQ(-1, /* sizeof(name) insufficient, memccpy failure */
|
||||
LookupProtoByNumber(73, name, 1, "protocols"));
|
||||
ASSERT_STREQ(name, ""); /* cleaned up after memccpy failed */
|
||||
|
||||
ASSERT_EQ(0, /* works with valid number */
|
||||
LookupProtoByNumber(73, name, sizeof(name), "protocols"));
|
||||
ASSERT_STREQ(name, "rspf"); /* official name written */
|
||||
}
|
||||
|
||||
TEST(LookupProtoByName, GetNumberWhenNameOrAlias) {
|
||||
char name[16]; /* sample has only names of length 3-4 */
|
||||
strcpy(name, "");
|
||||
|
||||
ASSERT_EQ(-1, /* non-existent name or alias */
|
||||
LookupProtoByName("tcp", name, sizeof(name), "protocols"));
|
||||
|
||||
ASSERT_EQ(-1, /* sizeof(name) insufficient, memccpy failure */
|
||||
LookupProtoByName("ggp", name, 1, "protocols"));
|
||||
ASSERT_STREQ(name, ""); /* cleaned up after memccpy failed */
|
||||
|
||||
ASSERT_EQ(3, /* works with valid name */
|
||||
LookupProtoByName("ggp", name, sizeof(name), "protocols"));
|
||||
ASSERT_STREQ(name, "ggp");
|
||||
|
||||
ASSERT_EQ(73, /* works with valid alias */
|
||||
LookupProtoByName("CPHB", name, sizeof(name), "protocols"));
|
||||
ASSERT_STREQ(name, "rspf"); /* official name written */
|
||||
}
|
||||
|
|
@ -27,9 +27,9 @@
|
|||
╚─────────────────────────────────────────────────────────────────────────────*/
|
||||
#include "libc/dns/servicestxt.h"
|
||||
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/dns/dns.h"
|
||||
#include "libc/dns/ent.h"
|
||||
#include "libc/calls/calls.h"
|
||||
#include "libc/testlib/testlib.h"
|
||||
|
||||
char testlib_enable_tmp_setup_teardown;
|
||||
|
|
@ -48,88 +48,133 @@ ssh 22/tcp # SSH Remote Login Protocol";
|
|||
}
|
||||
|
||||
TEST(LookupServicesByPort, GetNameWhenPortCorrect) {
|
||||
char name[16]; /* sample has only names of length 3 */
|
||||
char name[8]; /* service names are of length 3 */
|
||||
char eitherproto[8]; /* protocol names are of length 3 */
|
||||
char proto1[] = "tcp";
|
||||
char proto2[] = "udp";
|
||||
char* localproto[1];
|
||||
char* localproto;
|
||||
strcpy(eitherproto, "");
|
||||
strcpy(name, "");
|
||||
|
||||
localproto[0] = NULL;
|
||||
ASSERT_EQ(
|
||||
-1, /* non existent port */
|
||||
LookupServicesByPort(965, localproto, name, sizeof(name), "services"));
|
||||
ASSERT_EQ(NULL, localproto[0]);
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(-1, /* non existent port */
|
||||
LookupServicesByPort(965, localproto, sizeof(eitherproto), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_EQ('\0', localproto[0]);
|
||||
|
||||
ASSERT_EQ(
|
||||
-1, /* port not in network byte order */
|
||||
LookupServicesByPort(22, localproto, name, sizeof(name), "services"));
|
||||
ASSERT_EQ(NULL, localproto[0]);
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(-1, /* port in network byte order */
|
||||
LookupServicesByPort(htons(22), localproto, sizeof(eitherproto),
|
||||
name, sizeof(name), "services"));
|
||||
ASSERT_EQ('\0', localproto[0]);
|
||||
|
||||
localproto[0] = proto2;
|
||||
localproto = proto2;
|
||||
ASSERT_EQ(-1, /* port ok but wrong protocol */
|
||||
LookupServicesByPort(htons(22), localproto, name, sizeof(name),
|
||||
LookupServicesByPort(22, localproto, sizeof(proto2), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(proto2, "udp");
|
||||
|
||||
localproto = proto1;
|
||||
ASSERT_EQ(
|
||||
-1, /* protocol is non-NULL/length must be nonzero */
|
||||
LookupServicesByPort(22, localproto, 0, name, sizeof(name), "services"));
|
||||
ASSERT_STREQ(proto1, "tcp");
|
||||
|
||||
localproto = proto1;
|
||||
ASSERT_EQ(-1, /* sizeof(name) insufficient, memccpy failure */
|
||||
LookupServicesByPort(22, localproto, sizeof(proto1), name, 1,
|
||||
"services"));
|
||||
ASSERT_EQ(localproto[0], proto2);
|
||||
ASSERT_STREQ(proto1, "tcp");
|
||||
ASSERT_STREQ(name, ""); /* cleaned up after memccpy failed */
|
||||
|
||||
localproto[0] = proto1;
|
||||
ASSERT_EQ(0, LookupServicesByPort(htons(22), localproto, name, sizeof(name),
|
||||
"services"));
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(
|
||||
-1, /* sizeof(proto) insufficient, memccpy failure */
|
||||
LookupServicesByPort(22, localproto, 1, name, sizeof(name), "services"));
|
||||
ASSERT_STREQ(eitherproto, ""); /* cleaned up after memccpy failed */
|
||||
|
||||
localproto = proto1;
|
||||
ASSERT_EQ(0, LookupServicesByPort(22, localproto, sizeof(proto1), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(name, "ssh");
|
||||
ASSERT_EQ(localproto[0], proto1);
|
||||
ASSERT_STREQ(proto1, "tcp");
|
||||
|
||||
localproto[0] = proto2;
|
||||
ASSERT_EQ(0, LookupServicesByPort(htons(19), localproto, name,
|
||||
localproto = proto2;
|
||||
ASSERT_EQ(0, LookupServicesByPort(19, localproto, sizeof(proto2), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(name, "chargen");
|
||||
ASSERT_EQ(localproto[0], proto2);
|
||||
ASSERT_STREQ(proto2, "udp");
|
||||
|
||||
localproto[0] = NULL;
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(0, /* pick first matching protocol */
|
||||
LookupServicesByPort(htons(19), localproto, name, sizeof(name),
|
||||
"services"));
|
||||
LookupServicesByPort(19, localproto, sizeof(eitherproto), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(name, "chargen");
|
||||
ASSERT_NE(NULL, localproto[0]); /* got alloc'd during the call */
|
||||
ASSERT_STREQ(localproto[0], "tcp");
|
||||
free(localproto[0]);
|
||||
ASSERT_NE('\0', localproto[0]); /* buffer filled during the call */
|
||||
ASSERT_STREQ(eitherproto, "tcp");
|
||||
}
|
||||
|
||||
TEST(LookupServicesByName, GetPortWhenNameOrAlias) {
|
||||
char name[16]; /* sample has only names of length 3 */
|
||||
char name[8]; /* service names are of length 3 */
|
||||
char eitherproto[8]; /* protocol names are of length 3 */
|
||||
char proto1[] = "tcp";
|
||||
char proto2[] = "udp";
|
||||
char* localproto[1];
|
||||
char* localproto;
|
||||
strcpy(eitherproto, "");
|
||||
strcpy(name, "");
|
||||
|
||||
localproto[0] = NULL;
|
||||
ASSERT_EQ(
|
||||
-1, /* non-existent name */
|
||||
LookupServicesByName("http", localproto, name, sizeof(name), "services"));
|
||||
ASSERT_EQ(NULL, localproto[0]);
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(-1, /* non-existent name */
|
||||
LookupServicesByName("http", localproto, sizeof(eitherproto), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_EQ('\0', localproto[0]);
|
||||
|
||||
localproto[0] = proto2;
|
||||
ASSERT_EQ(
|
||||
-1, /* name exists but wrong protocol */
|
||||
LookupServicesByName("ssh", localproto, name, sizeof(name), "services"));
|
||||
ASSERT_EQ(localproto[0], proto2);
|
||||
localproto = proto2;
|
||||
ASSERT_EQ(-1, /* name exists but wrong protocol */
|
||||
LookupServicesByName("ssh", localproto, sizeof(proto2), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(proto2, "udp");
|
||||
|
||||
localproto[0] = proto1;
|
||||
ASSERT_EQ(
|
||||
htons(22), /* in network byte order */
|
||||
LookupServicesByName("ssh", localproto, name, sizeof(name), "services"));
|
||||
localproto = proto2;
|
||||
ASSERT_EQ(-1, /* protocol is non-NULL/length must be nonzero */
|
||||
LookupServicesByName("ssh", localproto, 0, name, sizeof(name),
|
||||
"services"));
|
||||
ASSERT_STREQ(proto2, "udp");
|
||||
|
||||
localproto = proto1;
|
||||
ASSERT_EQ(-1, /* sizeof(name) insufficient, memccpy failure */
|
||||
LookupServicesByName("ssh", localproto, sizeof(proto1), name, 1,
|
||||
"services"));
|
||||
ASSERT_STREQ(proto1, "tcp");
|
||||
ASSERT_STREQ(name, ""); /* cleaned up after memccpy failed */
|
||||
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(-1, /* sizeof(proto) insufficient, memccpy failure */
|
||||
LookupServicesByName("ssh", localproto, 1, name, sizeof(name),
|
||||
"services"));
|
||||
ASSERT_STREQ(eitherproto, ""); /* cleaned up after memccpy failed */
|
||||
|
||||
localproto = proto1;
|
||||
ASSERT_EQ(22, LookupServicesByName("ssh", localproto, sizeof(proto1), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(name, "ssh"); /* official name written to buffer */
|
||||
ASSERT_EQ(localproto[0], proto1);
|
||||
ASSERT_STREQ(proto1, "tcp");
|
||||
|
||||
localproto[0] = proto2;
|
||||
ASSERT_EQ(htons(19), /* works if alias provided */
|
||||
LookupServicesByName("ttytst", localproto, name, sizeof(name),
|
||||
"services"));
|
||||
localproto = proto2;
|
||||
ASSERT_EQ(19, /* works if alias provided */
|
||||
LookupServicesByName("ttytst", localproto, sizeof(proto2), name,
|
||||
sizeof(name), "services"));
|
||||
ASSERT_STREQ(name, "chargen"); /* official name written to buffer */
|
||||
ASSERT_EQ(localproto[0], proto2);
|
||||
|
||||
localproto[0] = NULL;
|
||||
ASSERT_EQ(htons(19), /* pick first matching protocol */
|
||||
LookupServicesByName("source", localproto, name, sizeof(name),
|
||||
localproto = proto2;
|
||||
ASSERT_EQ(19, /* can get port returned without official name */
|
||||
LookupServicesByName("ttytst", localproto, sizeof(proto2), NULL, 0,
|
||||
"services"));
|
||||
|
||||
localproto = eitherproto;
|
||||
ASSERT_EQ(19, /* pick first matching protocol */
|
||||
LookupServicesByName("source", localproto, sizeof(eitherproto),
|
||||
name, sizeof(name), "services"));
|
||||
ASSERT_STREQ(name, "chargen");
|
||||
ASSERT_NE(NULL, localproto[0]); /* got alloc'd during the call */
|
||||
ASSERT_STREQ(localproto[0], "tcp");
|
||||
free(localproto[0]);
|
||||
ASSERT_STREQ(localproto, "tcp");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue