build: abolish dlsymming midb_agent

Author: jengelh

Makefile.am

@@ -124,7 +124,7 @@ libgxs_event_stub_la_SOURCES = mra/event_stub.cpp
 libgxs_event_stub_la_LDFLAGS = ${default_SYFLAGS}
 libgxs_event_stub_la_LIBADD = -lpthread ${libHX_LIBS} libgromox_common.la
 EXTRA_libgxs_event_stub_la_DEPENDENCIES = default.sym
-libgxs_midb_agent_la_SOURCES = mra/midb_agent.cpp
+libgxs_midb_agent_la_SOURCES = mra/midb_agent.cpp mra/midb_agent.hpp
 libgxs_midb_agent_la_LDFLAGS = ${default_SYFLAGS}
 libgxs_midb_agent_la_LIBADD = -lpthread ${libHX_LIBS} libgromox_common.la
 EXTRA_libgxs_midb_agent_la_DEPENDENCIES = default.sym
@@ -351,7 +351,7 @@ tzd_files += data/Greenwich.tzd data/Haiti.tzd data/Hawaiian.tzd data/India.tzd
 tzd_files += data/Saratov.tzd data/Singapore.tzd data/South_Africa.tzd data/South_Sudan.tzd data/Sri_Lanka.tzd data/Sudan.tzd data/Syria.tzd data/Taipei.tzd data/Tasmania.tzd data/Tocantins.tzd data/Tokyo.tzd data/Tomsk.tzd data/Tonga.tzd data/Transbaikal.tzd data/Turkey.tzd data/Turks_And_Caicos.tzd data/US_Eastern.tzd data/US_Mountain.tzd data/UTC+12.tzd data/UTC+13.tzd data/UTC-02.tzd data/UTC-08.tzd data/UTC-09.tzd data/UTC-11.tzd data/UTC.tzd data/Ulaanbaatar.tzd data/Venezuela.tzd data/Vladivostok.tzd data/Volgograd.tzd data/W__Australia.tzd data/W__Central_Africa.tzd data/W__Europe.tzd data/W__Mongolia.tzd data/West_Asia.tzd data/West_Bank.tzd data/West_Pacific.tzd data/Yakutsk.tzd data/Yukon.tzd
 tzd_files += data/windowsZones.xml
 header_files = include/gromox/ab_tree.hpp include/gromox/arcfour.hpp include/gromox/archive.hpp include/gromox/atomic.hpp include/gromox/authmgr.hpp include/gromox/bounce_gen.hpp include/gromox/clock.hpp include/gromox/common_types.hpp include/gromox/config_file.hpp include/gromox/contexts_pool.hpp include/gromox/cookie_parser.hpp include/gromox/cryptoutil.hpp include/gromox/database.h include/gromox/database_mysql.hpp include/gromox/dbop.h include/gromox/dcerpc.hpp include/gromox/defs.h include/gromox/double_list.hpp include/gromox/dsn.hpp include/gromox/eid_array.hpp include/gromox/element_data.hpp include/gromox/endian.hpp include/gromox/exmdb_client.hpp include/gromox/exmdb_common_util.hpp include/gromox/exmdb_ext.hpp include/gromox/exmdb_idef.hpp include/gromox/exmdb_provider_client.hpp include/gromox/exmdb_rpc.hpp include/gromox/exmdb_server.hpp include/gromox/ext_buffer.hpp
-header_files += include/gromox/fileio.h include/gromox/flusher_common.h include/gromox/freebusy.hpp include/gromox/gab.hpp include/gromox/generic_connection.hpp include/gromox/hook_common.h include/gromox/hpm_common.h include/gromox/http.hpp include/gromox/ical.hpp include/gromox/icase.hpp include/gromox/json.hpp include/gromox/list_file.hpp include/gromox/lzxpress.hpp include/gromox/mail.hpp include/gromox/mail_func.hpp include/gromox/mapi_types.hpp include/gromox/mapidefs.h include/gromox/mapierr.hpp include/gromox/mapitags.hpp include/gromox/midb.hpp include/gromox/mime.hpp include/gromox/mjson.hpp include/gromox/msg_unit.hpp include/gromox/msgchg_grouping.hpp include/gromox/mysql_adaptor.hpp include/gromox/ndr.hpp include/gromox/ntlmssp.hpp include/gromox/oxcmail.hpp include/gromox/oxoabkt.hpp
+header_files += include/gromox/fileio.h include/gromox/flusher_common.h include/gromox/freebusy.hpp include/gromox/gab.hpp include/gromox/generic_connection.hpp include/gromox/hook_common.h include/gromox/hpm_common.h include/gromox/http.hpp include/gromox/ical.hpp include/gromox/icase.hpp include/gromox/json.hpp include/gromox/list_file.hpp include/gromox/lzxpress.hpp include/gromox/mail.hpp include/gromox/mail_func.hpp include/gromox/mapi_types.hpp include/gromox/mapidefs.h include/gromox/mapierr.hpp include/gromox/mapitags.hpp include/gromox/midb.hpp include/gromox/mime.hpp include/gromox/mjson.hpp include/gromox/msgchg_grouping.hpp include/gromox/mysql_adaptor.hpp include/gromox/ndr.hpp include/gromox/ntlmssp.hpp include/gromox/oxcmail.hpp include/gromox/oxoabkt.hpp
 header_files += include/gromox/paths.h.in include/gromox/pcl.hpp include/gromox/plugin.hpp include/gromox/proc_common.h include/gromox/process.hpp include/gromox/proptag_array.hpp include/gromox/propval.hpp include/gromox/range_set.hpp include/gromox/resource_pool.hpp include/gromox/restriction.hpp include/gromox/rop_util.hpp include/gromox/rpc_types.hpp include/gromox/rule_actions.hpp include/gromox/safeint.hpp include/gromox/scope.hpp include/gromox/simple_tree.hpp include/gromox/sortorder_set.hpp include/gromox/stream.hpp include/gromox/svc_common.h include/gromox/svc_loader.hpp include/gromox/textmaps.hpp include/gromox/threads_pool.hpp include/gromox/tie.hpp include/gromox/tnef.hpp include/gromox/usercvt.hpp include/gromox/util.hpp include/gromox/vcard.hpp include/gromox/xarray2.hpp include/gromox/zcore_client.hpp include/gromox/zcore_rpc.hpp include/gromox/zz_ndr_stack.hpp
 header_files += lib/mapi/oxcmail_int.hpp
 list_files = data/cpid.txt data/exmdb_list.txt data/folder_names.txt data/lang_charset.txt data/lcid.txt data/mime_extension.txt data/propnames.txt

default.sym

@@ -13,6 +13,10 @@ global:
 	};
 	_ZGV*;
 	_ZT*;
+
+	extern "C++" {
+		midb_agent::*;
+	};
 local:
 	*;
 };

include/gromox/midb_agent.hpp

@@ -0,0 +1,60 @@
+#pragma once
+#include <string>
+#include <gromox/range_set.hpp>
+#include <gromox/xarray2.hpp>
+
+enum {
+	MIDB_RESULT_OK = 0,
+	MIDB_NO_SERVER,
+	MIDB_RDWR_ERROR,
+	MIDB_RESULT_ERROR,
+	/* server_enomem is conveyed via RESULT_ERROR + errnum=ENOMEM */
+	MIDB_LOCAL_ENOMEM,
+	MIDB_TOO_MANY_RESULTS,
+};
+
+enum {
+	FLAG_RECENT   = 0x1,
+	FLAG_ANSWERED = 0x2,
+	FLAG_FLAGGED  = 0x4,
+	FLAG_DELETED  = 0x8,
+	FLAG_SEEN     = 0x10,
+	FLAG_DRAFT    = 0x20,
+	FLAG_LOADED   = 0x80,
+};
+
+struct MSG_UNIT {
+	std::string file_name;
+	size_t size = 0;
+	bool b_deleted = false;
+};
+
+using enum_folder_t = std::pair<uint64_t, std::string>;
+
+namespace midb_agent {
+
+extern GX_EXPORT int list_mail(const char *path, const std::string &folder, std::vector<MSG_UNIT> &, int *num, uint64_t *size);
+extern GX_EXPORT int delete_mail(const char *path, const std::string &folder, const std::vector<MSG_UNIT *> &);
+extern GX_EXPORT int get_uid(const char *path, const std::string &folder, const std::string &mid, unsigned int *uid);
+extern GX_EXPORT int summary_folder(const char *path, const std::string &folder, size_t *exists, size_t *recent, size_t *unseen, uint32_t *uidvalid, uint32_t *uidnext, int *perrno);
+extern GX_EXPORT int make_folder(const char *path, const std::string &folder, int *perrno);
+extern GX_EXPORT int remove_folder(const char *path, const std::string &folder, int *perrno);
+extern GX_EXPORT int ping_mailbox(const char *path, int *perrno);
+extern GX_EXPORT int rename_folder(const char *path, const std::string &src_name, const std::string &dst_name, int *perrno);
+extern GX_EXPORT int subscribe_folder(const char *path, const std::string &folder, int *perrno);
+extern GX_EXPORT int unsubscribe_folder(const char *path, const std::string &folder, int *perrno);
+extern GX_EXPORT int enum_folders(const char *path, std::vector<enum_folder_t> &, int *perrno);
+extern GX_EXPORT int enum_subscriptions(const char *path, std::vector<enum_folder_t> &, int *perrno);
+extern GX_EXPORT int insert_mail(const char *path, const std::string &folder, const char *file_name, const char *flags_string, long time_stamp, int *perrno);
+extern GX_EXPORT int remove_mail(const char *path, const std::string &folder, const std::vector<MITEM *> &, int *perrno);
+extern GX_EXPORT int list_deleted(const char *path, const std::string &folder, XARRAY *, int *perrno);
+extern GX_EXPORT int fetch_simple_uid(const char *path, const std::string &folder, const gromox::imap_seq_list &, XARRAY *, int *perrno);
+extern GX_EXPORT int fetch_detail_uid(const char *path, const std::string &folder, const gromox::imap_seq_list &, XARRAY *, int *perrno);
+extern GX_EXPORT int set_flags(const char *path, const std::string &folder, const std::string &mid, int flag_bits, int *perrno);
+extern GX_EXPORT int unset_flags(const char *path, const std::string &folder, const std::string &mid, int flag_bits, int *perrno);
+extern GX_EXPORT int get_flags(const char *path, const std::string &folder, const std::string &mid, int *pflag_bits, int *perrno);
+extern GX_EXPORT int copy_mail(const char *path, const std::string &src_folder, const std::string &src_mid, const std::string &dst_folder, std::string &dst_mid, int *perrno);
+extern GX_EXPORT int search(const char *path, const std::string &folder, const char *charset, int argc, char **argv, std::string &ret_buff, int *perrno);
+extern GX_EXPORT int search_uid(const char *path, const std::string &folder, const char *charset, int argc, char **argv, std::string &ret_buff, int *perrno);
+
+}

include/gromox/msg_unit.hpp

@@ -132,8 +132,6 @@ struct imap_context final : public schedule_context {
 	bool synchronizing_literal = true;
 };
 
-using enum_folder_t = std::pair<uint64_t, std::string>;
-
 extern void imap_parser_init(int context_num, int average_num, size_t cache_size, gromox::time_duration timeout, gromox::time_duration autologout_time, int max_auth_times, int block_auth_fail, bool support_tls, bool force_tls, const char *certificate_path, const char *cb_passwd, const char *key_path);
 extern int imap_parser_run();
 extern tproc_status imap_parser_process(schedule_context *);
@@ -209,27 +207,6 @@ extern bool (*system_services_judge_user)(const char *);
 extern void (*system_services_ban_user)(const char *, int);
 extern authmgr_login_t system_services_auth_login;
 extern gromox::errno_t (*system_services_auth_meta)(const char *username, unsigned int wantpriv, sql_meta_result &out);
-extern int (*system_services_get_uid)(const char *, const std::string &fld, const std::string &mid_string, unsigned int *uid);
-extern int (*system_services_summary_folder)(const char *, const std::string &, size_t *, size_t *, size_t *, uint32_t *, uint32_t *, int *);
-extern int (*system_services_make_folder)(const char *, const std::string &, int *);
-extern int (*system_services_remove_folder)(const char *, const std::string &, int *);
-extern int (*system_services_rename_folder)(const char *, const std::string &, const std::string &, int *);
-extern int (*system_services_ping_mailbox)(const char *, int *);
-extern int (*system_services_subscribe_folder)(const char *, const std::string &, int *);
-extern int (*system_services_unsubscribe_folder)(const char *, const std::string &, int *);
-extern int (*system_services_enum_folders)(const char *, std::vector<enum_folder_t> &, int *);
-extern int (*system_services_enum_subscriptions)(const char *, std::vector<enum_folder_t> &, int *);
-extern int (*system_services_insert_mail)(const char *, const std::string &fld, const char *, const char *, long, int *);
-extern int (*system_services_remove_mail)(const char *, const std::string &fld, const std::vector<MITEM *> &, int *);
-extern int (*system_services_list_deleted)(const char *, const std::string &fld, XARRAY *, int *err);
-extern int (*system_services_fetch_simple_uid)(const char *, const std::string &fld, const gromox::imap_seq_list &, XARRAY *, int *);
-extern int (*system_services_fetch_detail_uid)(const char *, const std::string &fld, const gromox::imap_seq_list &, XARRAY *, int *);
-extern int (*system_services_set_flags)(const char *, const std::string &fld, const std::string &mid, int, int *);
-extern int (*system_services_unset_flags)(const char *, const std::string &fld, const std::string &mid, int, int *);
-extern int (*system_services_get_flags)(const char *, const std::string &fld, const std::string &mid, int *, int *);
-extern int (*system_services_copy_mail)(const char *, const std::string &fld, const std::string &mid, const std::string &dst_fld, std::string &dst_mid, int *);
-extern int (*system_services_search)(const char *, const std::string &fld, const char *, int, char **, std::string &, int *);
-extern int (*system_services_search_uid)(const char *, const std::string &fld, const char *, int, char **, std::string &, int *);
 extern void (*system_services_install_event_stub)(void (*)(char *));
 extern void (*system_services_broadcast_event)(const char *);
 extern void (*system_services_broadcast_select)(const char *, const std::string &fld);