Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-08-18 20:41:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:andreaskem/mosquitto into andreaskem-develop

Browse Source
This commit is contained in:
Roger A. Light
2025-02-25 17:02:16 +00:00
parent cf37e80e6b a6d1f7b4d0
commit ee485341dd
11 changed files with 109 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/Makefile
+4
View File
@@ -29,6 +29,10 @@ ifeq ($(WITH_TLS),yes)
STATIC_LDADD+= -lssl -lcrypto
endif
ifeq ($(UNAME),AIX)
LOCAL_LDFLAGS+=-Wl,-bnoipath
endif
ifeq ($(WITH_SHARED_LIBRARIES),yes)
ALL_DEPS:= mosquitto_pub mosquitto_sub mosquitto_rr
else
config.h
+2
View File
@@ -12,6 +12,8 @@
# define _XOPEN_SOURCE 600
# define __BSD_VISIBLE 1
# define HAVE_NETINET_IN_H
#elif defined(_AIX)
# define HAVE_NETINET_IN_H
#else
# define _XOPEN_SOURCE 700
# define _DEFAULT_SOURCE 1
lib/cpp/Makefile
+4 -2
View File
@@ -1,8 +1,8 @@
R=../..
include ${R}/config.mk
ifneq ($(UNAME),SunOS)
LOCAL_LDFLAGS+=-Wl,-soname,libmosquittopp.so.${SOVERSION}
ifeq ($(or $(findstring $(UNAME),SunOS), $(findstring $(UNAME),AIX)),)
LOCAL_LDFLAGS+=-Wl,-soname,libmosquittopp.so.${SOVERSION}
endif
LOCAL_CPPFLAGS+=
LOCAL_CXXFLAGS+=-fPIC
@@ -24,7 +24,9 @@ install : all
ln -sf libmosquittopp.so.${SOVERSION} "${DESTDIR}${libdir}/libmosquittopp.so"
ifeq ($(WITH_STATIC_LIBRARIES),yes)
$(INSTALL) libmosquittopp.a "${DESTDIR}${libdir}/libmosquittopp.a"
ifneq ($(UNAME),AIX)
${CROSS_COMPILE}${STRIP} -g --strip-unneeded "${DESTDIR}${libdir}/libmosquittopp.a"
endif
endif
$(INSTALL) -d "${DESTDIR}${libdir}/pkgconfig/"
$(INSTALL) -m644 ${R}/libmosquittopp.pc.in "${DESTDIR}${libdir}/pkgconfig/libmosquittopp.pc"
lib/socks_mosq.c
+1 -1
View File
@@ -30,7 +30,7 @@ Contributors:
#else
# include <arpa/inet.h>
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__)
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(_AIX)
# include <sys/socket.h>
# include <netinet/in.h>
#endif
man/mosquitto.conf.5.xml
+1 -1
View File
@@ -1292,7 +1292,7 @@ accept_protocol_versions 3, 4</programlisting>
address/host</replaceable> part of the
<option>listener</option>, then <option>bind_interface</option>
will take priority.</para>
<para>This option is not available on Windows.</para>
<para>This option is not available on Windows and AIX.</para>
<para>Not reloaded on reload signal.</para>
</listitem>
</varlistentry>
plugins/plugin.mk
+4
View File
@@ -6,6 +6,10 @@ LOCAL_CPPFLAGS+=
LOCAL_LIBADD+=
LOCAL_LDFLAGS+=-fPIC -shared
ifeq ($(UNAME),AIX)
LOCAL_LDFLAGS+=-Wl,-G
endif
binary : ${PLUGIN_NAME}.so ${PLUGIN_NAME}.a
${PLUGIN_NAME}.a : ${OBJS} ${OBJS_EXTERNAL}
src/CMakeLists.txt
+1
View File
@@ -260,6 +260,7 @@ if(UNIX)
set_target_properties(mosquitto PROPERTIES
LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms"
)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "AIX")
else()
set_target_properties(mosquitto PROPERTIES
LINK_FLAGS "-Wl,-dynamic-list=${mosquitto_SOURCE_DIR}/src/linker.syms"
src/Makefile
+5 -1
View File
@@ -11,12 +11,16 @@ LOCAL_LDADD+=-lcjson -lm ${LIBMOSQ_COMMON}
# ------------------------------------------
# Platform specific
# ------------------------------------------
ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),)
ifneq ($(or $(findstring $(UNAME),AIX), $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),)
LOCAL_LDFLAGS+=-Wl,--dynamic-list=linker.syms
else
LOCAL_LDADD+=-ldl
endif
ifeq ($(UNAME),AIX)
LOCAL_LDFLAGS+=-Wl,-bE:linker-aix.syms
endif
ifeq ($(UNAME),Linux)
LOCAL_LDADD+=-lrt
LOCAL_LDFLAGS+=-Wl,--dynamic-list=linker.syms
src/context.c
+1 -1
View File
@@ -19,7 +19,7 @@ Contributors:
#include "config.h"
#include <time.h>
#ifdef __APPLE__
#if defined(__APPLE__) || defined(_AIX)
#include <sys/socket.h>
#endif
src/linker-aix.syms
+81
View File
@@ -0,0 +1,81 @@
mosquitto_apply_on_all_clients
mosquitto_broker_node_id_set
mosquitto_broker_publish
mosquitto_broker_publish_copy
mosquitto_callback_register
mosquitto_callback_unregister
mosquitto_calloc
mosquitto_client
mosquitto_client_address
mosquitto_client_certificate
mosquitto_client_clean_session
mosquitto_client_id
mosquitto_client_id_hashv
mosquitto_client_keepalive
mosquitto_client_port
mosquitto_client_protocol
mosquitto_client_protocol_version
mosquitto_client_sub_count
mosquitto_client_username
mosquitto_complete_basic_auth
mosquitto_control_command_reply
mosquitto_control_generic_callback
mosquitto_control_send_response
mosquitto_free
mosquitto_kick_client_by_clientid
mosquitto_kick_client_by_username
mosquitto_log_printf
mosquitto_log_vprintf
mosquitto_malloc
mosquitto_persist_base_msg_add
mosquitto_persist_base_msg_delete
mosquitto_persist_client_add
mosquitto_persist_client_delete
mosquitto_persist_client_msg_add
mosquitto_persist_client_msg_clear
mosquitto_persist_client_msg_delete
mosquitto_persist_client_msg_update
mosquitto_persist_client_update
mosquitto_persist_retain_msg_delete
mosquitto_persist_retain_msg_set
mosquitto_persistence_location
mosquitto_plugin_set_info
mosquitto_property_add_binary
mosquitto_property_add_byte
mosquitto_property_add_int16
mosquitto_property_add_int32
mosquitto_property_add_string
mosquitto_property_add_string_pair
mosquitto_property_add_varint
mosquitto_property_check_all
mosquitto_property_check_command
mosquitto_property_copy_all
mosquitto_property_free_all
mosquitto_property_identifier
mosquitto_property_identifier_to_string
mosquitto_property_next
mosquitto_property_read_binary
mosquitto_property_read_byte
mosquitto_property_read_int16
mosquitto_property_read_int32
mosquitto_property_read_string
mosquitto_property_read_string_pair
mosquitto_property_read_varint
mosquitto_pub_topic_check2
mosquitto_pub_topic_check
mosquitto_realloc
mosquitto_set_clientid
mosquitto_set_username
mosquitto_strdup
mosquitto_string_to_property_info
mosquitto_strndup
mosquitto_sub_matches_acl
mosquitto_sub_matches_acl_with_pattern
mosquitto_sub_topic_check2
mosquitto_sub_topic_check
mosquitto_subscription_add
mosquitto_subscription_delete
mosquitto_topic_matches_sub2
mosquitto_topic_matches_sub
mosquitto_topic_matches_sub_with_pattern
mosquitto_validate_utf8
src/net.c
+5 -3
View File
@@ -20,7 +20,9 @@ Contributors:
#ifndef WIN32
# include <arpa/inet.h>
# include <ifaddrs.h>
# ifndef _AIX
# include <ifaddrs.h>
# endif
# include <netdb.h>
# include <netinet/tcp.h>
# include <strings.h>
@@ -656,7 +658,7 @@ int net__tls_load_verify(struct mosquitto__listener *listener)
}
#ifndef WIN32
#if !defined(WIN32) && !defined(_AIX)
static int net__bind_interface(struct mosquitto__listener *listener, struct addrinfo *rp)
{
/*
@@ -805,7 +807,7 @@ static int net__socket_listen_tcp(struct mosquitto__listener *listener)
return 1;
}
#ifndef WIN32
#if !defined(WIN32) && !defined(_AIX)
if(listener->bind_interface){
/* It might be possible that an interface does not support all relevant sa_families.
* We should successfully find at least one. */