Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1568 #1569

Merged
merged 4 commits into from
Dec 19, 2023
Merged

Fix #1568 #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ca1eec
* MDF [nanomq/lib] add missing header include files
JaylinYu Dec 19, 2023
c539295
* FIX [CMakeLIst] fix #1568 check rpath before apply it
JaylinYu Dec 19, 2023
a17a655
* FIX [nanomq_cli/CMakeList] fix #1568 for nanomq_cli
JaylinYu Dec 19, 2023
6cdfa05
* MDF [nanomq/CMakeList] remove redundant source file
JaylinYu Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions nanomq/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ add_subdirectory(tests)
# set(PARALLEL 128 CACHE STRING "Parallelism (min 4, max 1000)")

set(SOURCES
mqtt_api.c
nanomq.c
process.c
bridge.c
pub_handler.c
Expand All @@ -51,8 +49,10 @@ set(SOURCES
conf_api.c
cmd_proc.c
acl_handler.c
mqtt_api.c
nanomq.c
apps/broker.c
)
)

include_directories(${FOUNDATION_INCLUDE_DIR})

Expand Down Expand Up @@ -104,7 +104,12 @@ if(BUILD_QUIC_CLI)
target_link_libraries(nanomq nng msquic)
endif(BUILD_QUIC_CLI)

set_target_properties(nanomq PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_RPATH}")
if (CMAKE_INSTALL_RPATH)
set_target_properties(nanomq PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_RPATH}")
message("Dynamic link rpath: ${CMAKE_INSTALL_RPATH}")
endif()



target_link_libraries(nanomq nng)

Expand Down
1 change: 1 addition & 0 deletions nanomq/apps/broker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#include "include/webhook_post.h"
#include "include/webhook_inproc.h"
#include "include/cmd_proc.h"
#include "include/process.h"
#include "include/nanomq.h"
// #if defined(SUPP_RULE_ENGINE)
// #include <foundationdb/fdb_c.h>
Expand Down
1 change: 1 addition & 0 deletions nanomq/conf_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "conf_api.h"
#include "include/mqtt_api.h"
#include "include/nanomq.h"

static cJSON *get_auth_http_req_config(conf_auth_http_req *req);
Expand Down
18 changes: 13 additions & 5 deletions nanomq/include/process.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
#ifndef PROCESS_H
#define PROCESS_H

int process_is_alive(int pid);
int process_send_signal(int pid, int signal);
int pidgrp_send_signal(int pid, int signal);
int process_daemonize(void);
int process_create_child(int (*child_run)(void *), void *data);
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

？

#endif

extern int process_is_alive(int pid);
extern int process_send_signal(int pid, int signal);
extern int pidgrp_send_signal(int pid, int signal);
extern int process_daemonize(void);
extern int process_create_child(int (*child_run)(void *), void *data);

#endif
23 changes: 12 additions & 11 deletions nanomq/rest_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
// found online at https://opensource.org/licenses/MIT.
//

#include "nng/nng.h"
#include "nng/mqtt/mqtt_client.h"
#include "nng/protocol/mqtt/mqtt_parser.h"
#include "nng/protocol/mqtt/nmq_mqtt.h"
#include "nng/supplemental/http/http.h"
#include "nng/supplemental/util/platform.h"
#include "nng/supplemental/nanolib/log.h"

#include "include/rest_api.h"
#include "include/bridge.h"
#include "include/conf_api.h"
Expand All @@ -19,14 +27,7 @@
#include "include/nanomq_rule.h"
#include "include/sub_handler.h"
#include "include/version.h"

#include "nng/nng.h"
#include "nng/mqtt/mqtt_client.h"
#include "nng/protocol/mqtt/mqtt_parser.h"
#include "nng/protocol/mqtt/nmq_mqtt.h"
#include "nng/supplemental/http/http.h"
#include "nng/supplemental/util/platform.h"
#include "nng/supplemental/nanolib/log.h"
#include "include/mqtt_api.h"

#include <stdint.h>
#include <stdio.h>
Expand Down Expand Up @@ -2379,9 +2380,9 @@ static void *
get_client_info_cb(uint32_t pid)
{

nng_pipe pipe = { .id = pid };
conn_param *cp = nng_pipe_cparam(pipe);
uint8_t *clientid = conn_param_get_clientid(cp);
nng_pipe pipe = { .id = pid };
conn_param *cp = nng_pipe_cparam(pipe);
const uint8_t *clientid = conn_param_get_clientid(cp);
conn_param_free(cp);
return (void *) clientid;
}
Expand Down
5 changes: 4 additions & 1 deletion nanomq_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ if(BUILD_NFTP)
endif(BUILD_NFTP)

target_link_libraries(nanomq_cli nng)
set_target_properties(nanomq_cli PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_RPATH}")
if (CMAKE_INSTALL_RPATH)
set_target_properties(nanomq_cli PROPERTIES LINK_FLAGS "-Wl,-rpath,${CMAKE_INSTALL_RPATH}")
endif()


if(BUILD_DDS_PROXY)
target_link_libraries(nanomq_cli ${IDL_LIB_NAME} CycloneDDS::ddsc)
Expand Down
Loading