Rename DNSLookupServer => LookupServer.

This commit is contained in:
Andreas Kling 2019-03-20 04:26:30 +01:00
parent 67009cee8e
commit 9120b05a40
Notes: sideshowbarker 2024-07-19 14:59:40 +09:00
10 changed files with 21 additions and 22 deletions

View File

@ -85,9 +85,9 @@ VFS* vfs;
int error;
auto* dns_lookup_server_process = Process::create_user_process("/bin/DNSLookupServer", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, { }, tty0);
auto* dns_lookup_server_process = Process::create_user_process("/bin/LookupServer", (uid_t)100, (gid_t)100, (pid_t)0, error, { }, { }, tty0);
if (error != 0) {
dbgprintf("error spawning DNSLookupServer: %d\n", error);
dbgprintf("error spawning LookupServer: %d\n", error);
hang();
}

View File

@ -12,8 +12,8 @@ $make_cmd -C ../LibM && \
(cd ../LibM && ./install.sh) && \
$make_cmd -C ../LibM clean && \
$make_cmd -C ../LibM clean && \
$make_cmd -C ../Servers/DNSLookupServer clean && \
$make_cmd -C ../Servers/DNSLookupServer && \
$make_cmd -C ../Servers/LookupServer clean && \
$make_cmd -C ../Servers/LookupServer && \
$make_cmd -C ../WindowServer clean && \
$make_cmd -C ../WindowServer && \
$make_cmd -C ../LibGUI clean && \

View File

@ -88,8 +88,7 @@ cp -v ../Applications/About/About mnt/bin/About
cp -v ../Applications/TextEditor/TextEditor mnt/bin/TextEditor
cp -v ../Applications/IRCClient/IRCClient mnt/bin/IRCClient
ln -s IRCClient mnt/bin/irc
cp -v ../Servers/DNSLookupServer/DNSLookupServer mnt/bin/DNSLookupServer
ln -s DNSLookupServer mnt/bin/dns
cp -v ../Servers/LookupServer/LookupServer mnt/bin/LookupServer
cp -v ../WindowServer/WindowServer mnt/bin/WindowServer
cp -v kernel.map mnt/
sh sync-local.sh

View File

@ -44,7 +44,7 @@ hostent* gethostbyname(const char* name)
sockaddr_un address;
address.sun_family = AF_LOCAL;
strcpy(address.sun_path, "/tmp/.DNSLookupServer-socket");
strcpy(address.sun_path, "/tmp/.LookupServer-socket");
int retries = 3;
int rc = 0;

View File

@ -1,3 +0,0 @@
*.o
*.d
DNSLookupServer

3
Servers/LookupServer/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
*.o
*.d
LookupServer

View File

@ -1,8 +1,8 @@
DNSLOOKUPSERVER_OBJS = \
LOOKUPSERVER_OBJS = \
main.o
APP = DNSLookupServer
OBJS = $(DNSLOOKUPSERVER_OBJS)
APP = LookupServer
OBJS = $(LOOKUPSERVER_OBJS)
STANDARD_FLAGS = -std=c++17
WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough

View File

@ -31,7 +31,7 @@ int main(int argc, char**argv)
(void)argc;
(void)argv;
unlink("/tmp/.DNSLookupServer-socket");
unlink("/tmp/.LookupServer-socket");
HashMap<String, IPv4Address> dns_cache;
@ -43,7 +43,7 @@ int main(int argc, char**argv)
sockaddr_un address;
address.sun_family = AF_LOCAL;
strcpy(address.sun_path, "/tmp/.DNSLookupServer-socket");
strcpy(address.sun_path, "/tmp/.LookupServer-socket");
int rc = bind(server_fd, (const sockaddr*)&address, sizeof(address));
if (rc < 0) {
@ -93,7 +93,7 @@ int main(int argc, char**argv)
client_buffer[nrecv] = '\0';
auto hostname = String(client_buffer, nrecv, Chomp);
dbgprintf("DNSLookupServer: Got request for '%s'\n", hostname.characters());
dbgprintf("LookupServer: Got request for '%s'\n", hostname.characters());
Vector<IPv4Address> addresses;
@ -107,7 +107,7 @@ int main(int argc, char**argv)
break;
} while (--retries);
if (did_timeout) {
fprintf(stderr, "DNSLookupServer: Out of retries :(\n");
fprintf(stderr, "LookupServer: Out of retries :(\n");
close(client_fd);
continue;
}
@ -213,7 +213,7 @@ Vector<IPv4Address> lookup(const String& hostname, bool& did_timeout)
response_buffer[nrecv] = '\0';
if (nrecv < (int)sizeof(DNSPacket)) {
dbgprintf("DNSLookupServer: Response not big enough (%d) to be a DNS packet :(\n", nrecv);
dbgprintf("LookupServer: Response not big enough (%d) to be a DNS packet :(\n", nrecv);
return { };
}
@ -225,15 +225,15 @@ Vector<IPv4Address> lookup(const String& hostname, bool& did_timeout)
//printf("Additional count: %u\n", response_header.additional_count());
if (response_header.id() != request_header.id()) {
dbgprintf("DNSLookupServer: ID mismatch (%u vs %u) :(\n", response_header.id(), request_header.id());
dbgprintf("LookupServer: ID mismatch (%u vs %u) :(\n", response_header.id(), request_header.id());
return { };
}
if (response_header.question_count() != 1) {
dbgprintf("DNSLookupServer: Question count (%u vs %u) :(\n", response_header.question_count(), request_header.question_count());
dbgprintf("LookupServer: Question count (%u vs %u) :(\n", response_header.question_count(), request_header.question_count());
return { };
}
if (response_header.answer_count() < 1) {
dbgprintf("DNSLookupServer: Not enough answers (%u) :(\n", response_header.answer_count());
dbgprintf("LookupServer: Not enough answers (%u) :(\n", response_header.answer_count());
return { };
}
@ -246,7 +246,7 @@ Vector<IPv4Address> lookup(const String& hostname, bool& did_timeout)
for (word i = 0; i < response_header.answer_count(); ++i) {
auto& record = *(const DNSRecord*)(&((const byte*)response_header.payload())[offset]);
auto ipv4_address = IPv4Address((const byte*)record.data());
dbgprintf("DNSLookupServer: Answer #%u: (question: %s), ttl=%u, length=%u, data=%s\n",
dbgprintf("LookupServer: Answer #%u: (question: %s), ttl=%u, length=%u, data=%s\n",
i,
question.characters(),
record.ttl(),