From 0a467bac35bcd6034c1a198fea569944f7707ad2 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Fri, 2 Dec 2016 12:46:37 +0200 Subject: [PATCH 1/2] modules: faked message api has moved to core --- fmsg.h | 2 +- modules/cnxcc/cnxcc_mod.c | 2 +- modules/dialog/dialog.c | 2 +- modules/dialog/dlg_handlers.c | 2 +- modules/dispatcher/dispatch.c | 2 +- modules/erlang/handle_emsg.c | 2 +- modules/evapi/evapi_dispatch.c | 2 +- modules/evapi/evapi_mod.c | 2 +- modules/htable/ht_api.c | 2 +- modules/htable/htable.c | 2 +- modules/http_async_client/async_http.c | 2 +- modules/http_async_client/http_async_client_mod.c | 2 +- modules/ims_dialog/dlg_handlers.c | 2 +- modules/ims_dialog/ims_dialog.c | 2 +- modules/kazoo/kz_amqp.h | 2 +- modules/mqueue/mqueue_api.c | 2 +- modules/registrar/regpv.c | 2 +- modules/rtimer/rtimer_mod.c | 2 +- modules/uac/uac_send.c | 2 +- modules/websocket/ws_conn.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fmsg.h b/fmsg.h index d442168a7d8..ada40c15a03 100644 --- a/fmsg.h +++ b/fmsg.h @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + #ifndef _FMSG_H_ #define _FMSG_H_ diff --git a/modules/cnxcc/cnxcc_mod.c b/modules/cnxcc/cnxcc_mod.c index e238b4475db..b2728a8fd64 100644 --- a/modules/cnxcc/cnxcc_mod.c +++ b/modules/cnxcc/cnxcc_mod.c @@ -55,7 +55,7 @@ #include "../dialog/dlg_load.h" #include "../dialog/dlg_hash.h" #include "../../mi/mi_types.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../rpc.h" #include "../../rpc_lookup.h" diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index bbe8e6f108f..504f7c0df69 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -56,7 +56,7 @@ #include "../../pvar.h" #include "../../mod_fix.h" #include "../../script_cb.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../hashes.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../mem/mem.h" diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 2d838d50215..121d33c7425 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -37,7 +37,7 @@ #include "../../action.h" #include "../../script_cb.h" #include "../../pt.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../parser/parse_from.h" #include "../../parser/parse_cseq.h" #include "../../parser/contact/parse_contact.h" diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index fd58b126592..4836f5296d8 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -52,7 +52,7 @@ #include "../../lib/srdb1/db_res.h" #include "../../str.h" #include "../../script_cb.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "ds_ht.h" #include "api.h" diff --git a/modules/erlang/handle_emsg.c b/modules/erlang/handle_emsg.c index e1aa51f3681..c6a7f35ea68 100644 --- a/modules/erlang/handle_emsg.c +++ b/modules/erlang/handle_emsg.c @@ -37,7 +37,7 @@ #include "../../dprint.h" #include "../../sr_module.h" #include "../../cfg/cfg_struct.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" int handle_msg_req_tuple(cnode_handler_t *phandler, erlang_msg * msg); int handle_req_ref_tuple(cnode_handler_t *phandler, erlang_msg * msg); diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 57603c4d903..0131e8f88fd 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -37,7 +37,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../cfg/cfg_struct.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "evapi_dispatch.h" diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index 6cb4e4f893f..3debd0eab30 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -36,7 +36,7 @@ #include "../../mod_fix.h" #include "../../pvar.h" #include "../../cfg/cfg_struct.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../modules/tm/tm_load.h" diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index d4e83bf1faf..76dba546bf1 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -30,7 +30,7 @@ #include "../../hashes.h" #include "../../ut.h" #include "../../re.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../action.h" #include "../../route.h" #include "../../kemi.h" diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 4b364938c18..d5bf8c54f66 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -38,7 +38,7 @@ #include "../../rpc_lookup.h" #include "../../kemi.h" #include "../../lib/kmi/mi.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../pvar.h" #include "ht_api.h" diff --git a/modules/http_async_client/async_http.c b/modules/http_async_client/async_http.c index d3ba6ad7bf3..d4dda8797c7 100644 --- a/modules/http_async_client/async_http.c +++ b/modules/http_async_client/async_http.c @@ -45,7 +45,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../cfg/cfg_struct.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../modules/tm/tm_load.h" #include "async_http.h" diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 8bd60734fbd..0412a47c1ae 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -49,7 +49,7 @@ #include "../../mod_fix.h" #include "../../pvar.h" #include "../../cfg/cfg_struct.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" diff --git a/modules/ims_dialog/dlg_handlers.c b/modules/ims_dialog/dlg_handlers.c index 9575b0a224c..15414b7e603 100644 --- a/modules/ims_dialog/dlg_handlers.c +++ b/modules/ims_dialog/dlg_handlers.c @@ -14,7 +14,7 @@ #include "../../lib/kcore/statistics.h" #include "../../action.h" #include "../../script_cb.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../parser/parse_from.h" #include "../../parser/parse_cseq.h" #include "../../parser/contact/parse_contact.h" diff --git a/modules/ims_dialog/ims_dialog.c b/modules/ims_dialog/ims_dialog.c index 81b33275e9e..abb73ecfb07 100644 --- a/modules/ims_dialog/ims_dialog.c +++ b/modules/ims_dialog/ims_dialog.c @@ -13,7 +13,7 @@ #include "../../pvar.h" #include "../../mod_fix.h" #include "../../script_cb.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../mem/mem.h" #include "../../lib/kmi/mi.h" diff --git a/modules/kazoo/kz_amqp.h b/modules/kazoo/kz_amqp.h index d35ca5f5642..b8d74fb7670 100644 --- a/modules/kazoo/kz_amqp.h +++ b/modules/kazoo/kz_amqp.h @@ -39,7 +39,7 @@ #include "const.h" #include "defs.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" typedef enum { KZ_AMQP_CONNECTION_CLOSED = 0, diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index 85ddf7e18ad..6ffa8e9b438 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -33,7 +33,7 @@ #include "../../parser/parse_param.h" #include "../../ut.h" #include "../../shm_init.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "mqueue_api.h" diff --git a/modules/registrar/regpv.c b/modules/registrar/regpv.c index 9b8b3bbc392..ac569741ae8 100644 --- a/modules/registrar/regpv.c +++ b/modules/registrar/regpv.c @@ -33,7 +33,7 @@ #include "../../mod_fix.h" #include "../../route.h" #include "../../action.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../usrloc/usrloc.h" #include "registrar.h" #include "common.h" diff --git a/modules/rtimer/rtimer_mod.c b/modules/rtimer/rtimer_mod.c index 3a1e56a2375..0de293940b9 100644 --- a/modules/rtimer/rtimer_mod.c +++ b/modules/rtimer/rtimer_mod.c @@ -42,7 +42,7 @@ #include "../../timer_proc.h" #include "../../script_cb.h" #include "../../parser/parse_param.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" MODULE_VERSION diff --git a/modules/uac/uac_send.c b/modules/uac/uac_send.c index 34277a0cfe0..5ed0a7aadda 100644 --- a/modules/uac/uac_send.c +++ b/modules/uac/uac_send.c @@ -35,7 +35,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" #include "../../parser/contact/parse_contact.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "auth.h" #include "auth_hdr.h" diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index a435727a744..af81726afec 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -27,7 +27,7 @@ #include "../../locking.h" #include "../../str.h" #include "../../tcp_conn.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/tree.h" #include "../../mem/mem.h" From 0e2cb067ac01988b3693c7a40fb65071df103666 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Fri, 2 Dec 2016 12:47:45 +0200 Subject: [PATCH 2/2] lib/kcore: faked_msg.h not referenced anymore --- lib/kcore/faked_msg.h | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 lib/kcore/faked_msg.h diff --git a/lib/kcore/faked_msg.h b/lib/kcore/faked_msg.h deleted file mode 100644 index 65ecb3f0da5..00000000000 --- a/lib/kcore/faked_msg.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * - * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) - * - * This file is part of kamailio, a free SIP server. - * - * kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _FAKED_SIP_MSG_H_ -#define _FAKED_SIP_MSG_H_ - -#include "../../fmsg.h" - -#endif