From: Susant Sahani <susant@redhat.com>
Date: Thu, 27 Apr 2017 05:11:46 +0000 (+0530)
Subject: config parser: Introduce config_parse_ip_port
X-Git-Tag: chiark/234.4-1+devuan1.1+iwj1~145
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4a121b358bb9d90bd50d73a74a1f9f133f479c5c

config parser: Introduce config_parse_ip_port
---

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 438f1a02f..06c05a0ce 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -973,3 +973,40 @@ int config_parse_ifname(
         return 0;
 }
 #endif // 0
+
+int config_parse_ip_port(
+                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) {
+
+        uint16_t *s = data;
+        uint16_t port;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        if (isempty(rvalue)) {
+                *s = 0;
+                return 0;
+        }
+
+        r = parse_ip_port(rvalue, &port);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse port '%s'.", rvalue);
+                return 0;
+        }
+
+        *s = port;
+
+        return 0;
+}
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index c9d0e7027..fc6014769 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -154,6 +154,7 @@ int config_parse_signal(const char *unit, const char *filename, unsigned line, c
 int config_parse_personality(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_ifname(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);
 #endif // 0
+int config_parse_ip_port(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);
 
 #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg)                \
         int function(const char *unit,                                  \