From 11a6e4ae21a40302b893b586bae8de5d923e6e87 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Mon, 1 Nov 2021 01:40:18 +0100 Subject: [PATCH] lib-pop3: Add definition for default service TCP ports. --- src/config/Makefile.am | 1 + src/config/settings-get.pl | 1 + src/lib-pop3/Makefile.am | 3 ++- src/lib-pop3/pop3-protocol.h | 7 +++++++ src/pop3-login/client.c | 5 +++-- src/pop3-login/pop3-login-settings.c | 6 ++++-- 6 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 src/lib-pop3/pop3-protocol.h diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 084ec0ed98..fb155df770 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib-mail \ -I$(top_srcdir)/src/lib-settings \ -I$(top_srcdir)/src/lib-master \ + -I$(top_srcdir)/src/lib-pop3 \ -DPKG_RUNDIR=\""$(rundir)"\" \ -DPKG_STATEDIR=\""$(statedir)"\" \ -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \ diff --git a/src/config/settings-get.pl b/src/config/settings-get.pl index ca124eb4ae..5bd28ae39a 100755 --- a/src/config/settings-get.pl +++ b/src/config/settings-get.pl @@ -21,6 +21,7 @@ print '#include "unichar.h"'."\n"; print '#include "hash-method.h"'."\n"; print '#include "settings-parser.h"'."\n"; print '#include "message-header-parser.h"'."\n"; +print '#include "pop3-protocol.h"'."\n"; print '#include "all-settings.h"'."\n"; print '#include '."\n"; print '#include '."\n"; diff --git a/src/lib-pop3/Makefile.am b/src/lib-pop3/Makefile.am index fc62d667a7..cc9eaed83d 100644 --- a/src/lib-pop3/Makefile.am +++ b/src/lib-pop3/Makefile.am @@ -1,5 +1,6 @@ headers = \ - pop3-capability.h + pop3-capability.h \ + pop3-protocol.h pkginc_libdir=$(pkgincludedir) pkginc_lib_HEADERS = $(headers) diff --git a/src/lib-pop3/pop3-protocol.h b/src/lib-pop3/pop3-protocol.h new file mode 100644 index 0000000000..e6d2b70016 --- /dev/null +++ b/src/lib-pop3/pop3-protocol.h @@ -0,0 +1,7 @@ +#ifndef POP3_PROTOCOL_H +#define POP3_PROTOCOL_H + +#define POP3_DEFAULT_PORT 110 +#define POP3S_DEFAULT_PORT 995 + +#endif diff --git a/src/pop3-login/client.c b/src/pop3-login/client.c index d57d284b13..1e7b334f89 100644 --- a/src/pop3-login/client.c +++ b/src/pop3-login/client.c @@ -12,6 +12,7 @@ #include "str.h" #include "strescape.h" #include "master-service.h" +#include "pop3-protocol.h" #include "client.h" #include "client-authenticate.h" #include "auth-client.h" @@ -373,8 +374,8 @@ static struct client_vfuncs pop3_client_vfuncs = { static struct login_binary pop3_login_binary = { .protocol = "pop3", .process_name = "pop3-login", - .default_port = 110, - .default_ssl_port = 995, + .default_port = POP3_DEFAULT_PORT, + .default_ssl_port = POP3S_DEFAULT_PORT, .event_category = { .name = "pop3", diff --git a/src/pop3-login/pop3-login-settings.c b/src/pop3-login/pop3-login-settings.c index 747e51e508..e81532590c 100644 --- a/src/pop3-login/pop3-login-settings.c +++ b/src/pop3-login/pop3-login-settings.c @@ -5,14 +5,16 @@ #include "settings-parser.h" #include "service-settings.h" #include "login-settings.h" +#include "pop3-protocol.h" #include "pop3-login-settings.h" #include /* */ static struct inet_listener_settings pop3_login_inet_listeners_array[] = { - { .name = "pop3", .address = "", .port = 110 }, - { .name = "pop3s", .address = "", .port = 995, .ssl = TRUE } + { .name = "pop3", .address = "", .port = POP3_DEFAULT_PORT }, + { .name = "pop3s", .address = "", .port = POP3S_DEFAULT_PORT, + .ssl = TRUE } }; static struct inet_listener_settings *pop3_login_inet_listeners[] = { &pop3_login_inet_listeners_array[0], -- 2.47.3