Use the term 'protocol' everywhere, instad of socket_type.

Author: someguy

src/netlog/netlog-conf.c

@@ -34,7 +34,7 @@ int config_parse_netlog_remote_address(const char *unit,
         return 0;
 }
 
-int config_parse_socket_type(const char *unit,
+int config_parse_protocol(const char *unit,
                              const char *filename,
                              unsigned line,
                              const char *section,
@@ -52,12 +52,12 @@ int config_parse_socket_type(const char *unit,
         assert(data);
 
         if (strcaseeq(rvalue, "tcp"))
-                m->socket_type = SOCK_STREAM;
+                m->protocol = SOCK_STREAM;
         else if (strcaseeq(rvalue, "udp"))
-                m->socket_type = SOCK_DGRAM;
+                m->protocol = SOCK_DGRAM;
         else {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
-                           "Unrecognised socket type '%s'; should be either 'tcp' or 'udp'", rvalue);
+                           "Unrecognised protocol '%s'; should be either 'tcp' or 'udp'", rvalue);
                 return -EINVAL;
         }
 

src/netlog/netlog-conf.h

@@ -17,14 +17,14 @@ int config_parse_netlog_remote_address(const char *unit,
                                        const char *rvalue,
                                        void *data,
                                        void *userdata);
-int config_parse_socket_type(const char *unit,
-                             const char *filename,
-                             unsigned line,
-                             const char *section,
-                             unsigned section_line,
-                             const char *lvalue,
-                             int ltype,
-                             const char *rvalue,
-                             void *data,
-                             void *userdata);
+int config_parse_protocol(const char *unit,
+                          const char *filename,
+                          unsigned line,
+                          const char *section,
+                          unsigned section_line,
+                          const char *lvalue,
+                          int ltype,
+                          const char *rvalue,
+                          void *data,
+                          void *userdata);
 int manager_parse_config_file(Manager *m);

src/netlog/netlog-gperf.gperf

@@ -16,5 +16,5 @@ struct ConfigPerfItem;
 %includes
 %%
 Network.Address,  config_parse_netlog_remote_address, 0, 0
-Network.Protocol,  config_parse_socket_type, 0, offsetof(Manager, socket_type)
+Network.Protocol,  config_parse_protocol, 0, offsetof(Manager, protocol)
 Network.StructuredData,  config_parse_string, 0, offsetof(Manager, structured_data)

src/netlog/netlog-manager.h

@@ -33,7 +33,7 @@ struct Manager {
 
         char *last_cursor, *current_cursor;
         char *structured_data;
-        int socket_type;
+        int protocol;
 };
 
 int manager_new(Manager **ret, const char *state_file, const char *cursor);

src/netlog/netlog-network.c

@@ -154,7 +154,7 @@ int manager_push_to_network(Manager *m,
         IOVEC_SET_STRING(iov[n++], message);
 
         /* Tenth: Newline message separator, if not implicitly terminated by end of UDP frame */
-        if (m->socket_type == SOCK_DGRAM)
+        if (m->protocol == SOCK_DGRAM)
                 IOVEC_SET_STRING(iov[n++], "\n");
 
         return network_send(m, iov, n);
@@ -175,7 +175,7 @@ int manager_open_network_socket(Manager *m) {
         if (!IN_SET(m->address.sockaddr.sa.sa_family, AF_INET, AF_INET6))
                 return -EAFNOSUPPORT;
 
-        m->socket = socket(m->address.sockaddr.sa.sa_family, m->socket_type|SOCK_CLOEXEC, 0);
+        m->socket = socket(m->address.sockaddr.sa.sa_family, m->protocol|SOCK_CLOEXEC, 0);
         if (m->socket < 0)
                 return -errno;
 
@@ -185,7 +185,7 @@ int manager_open_network_socket(Manager *m) {
                 goto fail;
         }
 
-        if (SOCK_STREAM == m->socket_type) {
+        if (SOCK_STREAM == m->protocol) {
                 union sockaddr_union sa;
                 socklen_t salen;
                 switch (m->address.sockaddr.sa.sa_family) {