2 files changed, 90 insertions, 0 deletions
diff --git a/tests/sockets/test_getprotobyname.c b/tests/sockets/test_getprotobyname.c
new file mode 100644
index 00000000..571a287e
--- /dev/null
+++ b/tests/sockets/test_getprotobyname.c
@@ -0,0 +1,87 @@
+#include <assert.h>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+void checkEntryByValue(char* name, int port, char** aliasArray) {
+    struct protoent* entry;
+    char** aliases;
+
+    // Perform a protocol look up by name
+    entry = getprotobyname(name);
+    assert(entry != NULL);
+
+    // Check results
+    assert(strcmp(name, entry->p_name) == 0);
+    assert(port == entry->p_proto);
+
+    aliases = entry->p_aliases;
+    for (int i = 0; aliases[i] != NULL; i++) {
+        assert(strcmp(aliases[i], aliasArray[i]) == 0);
+    }
+
+    // Perform a protocol look up by number
+    entry = getprotobynumber(port);
+    assert(entry != NULL);
+
+    // Check results
+    assert(strcmp(name, entry->p_name) == 0);
+    assert(port == entry->p_proto);
+
+    aliases = entry->p_aliases;
+    for (int i = 0; aliases[i] != NULL; i++) {
+        assert(strcmp(aliases[i], aliasArray[i]) == 0);
+    }
+}
+
+void checkEntryDatabase() {
+    struct protoent* entry;
+
+    // Don't call setprotoent() initially as getprotoent() should open the "database" if necessary.
+    entry = getprotoent();
+    assert(entry != NULL);
+    assert(strcmp("tcp", entry->p_name) == 0);
+
+    entry = getprotoent();
+    assert(entry != NULL);
+    assert(strcmp("udp", entry->p_name) == 0);
+
+    // Check that setprotoent() correctly sets the next entry to the first entry
+    setprotoent(1);
+
+    entry = getprotoent();
+    assert(entry != NULL);
+    assert(strcmp("tcp", entry->p_name) == 0);
+
+    entry = getprotoent();
+    assert(entry != NULL);
+    assert(strcmp("udp", entry->p_name) == 0);
+
+    // If we do a getprotoent() that goes past the end of the 'database' check that it returns NULL.
+    entry = getprotoent();
+    assert(entry == NULL);
+}
+
+int main() {
+    // First check getprotobyname() and getprotobynumber()
+    char* aliases[] = {"TCP"};
+    checkEntryByValue("tcp", 6, aliases);
+
+    aliases[0] = "UDP";
+    checkEntryByValue("udp", 17, aliases);
+
+    // Check that the doomsday protocol hasn't been implemented :-) ......
+    assert(getprotobyname("doomsday") == NULL);
+
+    // Now check setprotoent() and getprotoent()
+    checkEntryDatabase();
+
+    endprotoent();
+
+    puts("success");
+
+    return EXIT_SUCCESS;
+}
+
diff --git a/tests/test_sockets.py b/tests/test_sockets.py
index 1229aa70..f9dcbc68 100644
--- a/tests/test_sockets.py
+++ b/tests/test_sockets.py
@@ -228,6 +228,9 @@ class sockets(BrowserCore):
   def test_gethostbyname(self):
     self.do_run(open(path_from_root('tests', 'sockets', 'test_gethostbyname.c')).read(), 'success')
 
+  def test_getprotobyname(self):
+    self.do_run(open(path_from_root('tests', 'sockets', 'test_getprotobyname.c')).read(), 'success')
+
   def test_sockets_echo(self):
     sockets_include = '-I'+path_from_root('tests', 'sockets')