[Kamailio-Devel] [SR-Dev] [PATCH 01/10] Fix header files of acc module

[Jan Janak]

Hello,

This is a series of patches that make the kamailio acc module compile and load
with the shared sip-router core. 

I've updated many kamailio modules and got them to the point where they
compile and load with the shared sip router core. 

I've decided to send the patches that I have to the mailing lists for review
and suggestions, please review them if you can and let me know if you find a
problem or if you have suggestions how to do something better. 

Most of the changes are split logically into several patches end extensively
commented in hope that it will make them easier to review and k. module
maintainers could easily adapt them for their own migration work.

Please take it as a suggestion of how to migrate k. modules to the sip router
core, nothing more, respective module maintainers have the right to decide how
(or if at all) they want to have their modules converted.

Hope this helps. I can regenerate each path series easily if you do changes in
the svn repository or if we change something in the sip-router core
repository.

  Jan.

On 03-03 01:16, Jan Janak wrote:
> This commit fixes paths to various header files included by the module:
>  * DB API headers are now included from libsrdb1
>  * libkcore/km_ut.h included in files where functions from kamailio/ut.h
>    are used
>  * Included flags.h for flag setters and getters
>  * Included local_route.h from libkcore intead of the top level
>    directory
> ---
>  modules/acc/acc.c       |    3 ++-
>  modules/acc/acc_extra.c |    1 +
>  modules/acc/acc_logic.c |    2 ++
>  modules/acc/acc_mod.c   |    2 +-
>  4 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/acc/acc.c b/modules/acc/acc.c
> index b84c49d..3f43685 100644
> --- a/modules/acc/acc.c
> +++ b/modules/acc/acc.c
> @@ -50,7 +50,8 @@
>  #include "../../error.h"
>  #include "../../mem/mem.h"
>  #include "../../usr_avp.h"
> -#include "../../db/db.h"
> +#include "../../lib/srdb1/db.h"
> +#include "../../lib/kcore/km_ut.h"
>  #include "../../parser/hf.h"
>  #include "../../parser/msg_parser.h"
>  #include "../../parser/parse_from.h"
> diff --git a/modules/acc/acc_extra.c b/modules/acc/acc_extra.c
> index cf2d92c..1e0e06e 100644
> --- a/modules/acc/acc_extra.c
> +++ b/modules/acc/acc_extra.c
> @@ -48,6 +48,7 @@
>  #include "../../ut.h"
>  #include "../../usr_avp.h"
>  #include "../../mem/mem.h"
> +#include "../../lib/kcore/km_ut.h"
>  #include "acc_extra.h"
>  
>  #define EQUAL '='
> diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c
> index 6654d40..59e4440 100644
> --- a/modules/acc/acc_logic.c
> +++ b/modules/acc/acc_logic.c
> @@ -43,6 +43,8 @@
>  #include "../../parser/parse_content.h"
>  #include "../tm/tm_load.h"
>  #include "../rr/api.h"
> +#include "../../lib/kcore/km_ut.h"
> +#include "../../flags.h"
>  #include "acc.h"
>  #include "acc_mod.h"
>  #include "acc_logic.h"
> diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c
> index ea881d9..7e234e6 100644
> --- a/modules/acc/acc_mod.c
> +++ b/modules/acc/acc_mod.c
> @@ -63,7 +63,7 @@
>  #include <string.h>
>  
>  #include "../../sr_module.h"
> -#include "../../local_route.h"
> +#include "../../lib/kcore/local_route.h"
>  #include "../../dprint.h"
>  #include "../../mem/mem.h"
>  #include "../tm/tm_load.h"