@@ -135,14 +135,22 @@ void destroy(void);

  * Exported functions

  */

 static cmd_export_t cmds[] = {

-	{"jab_send_message",       xj_send_message,                     0,              0, 0, REQUEST_ROUTE},

-	{"jab_join_jconf",         xj_join_jconf,                       0,              0, 0, REQUEST_ROUTE},

-	{"jab_exit_jconf",         xj_exit_jconf,                       0,              0, 0, REQUEST_ROUTE},

-	{"jab_go_online",          xj_go_online,                        0,              0, 0, REQUEST_ROUTE},

-	{"jab_go_offline",         xj_go_offline,                       0,              0, 0, REQUEST_ROUTE},

-	{"jab_register_watcher",   (cmd_function)xj_register_watcher,   XJ_NO_SCRIPT_F, 0, 0, 0            },

-	{"jab_unregister_watcher", (cmd_function)xj_unregister_watcher, XJ_NO_SCRIPT_F, 0, 0, 0            },

-	{"load_xjab",              (cmd_function)load_xjab,             XJ_NO_SCRIPT_F, 0, 0, 0            },

+	{"jab_send_message",       (cmd_function)xj_send_message,       

+			0, 0, 0, REQUEST_ROUTE},

+	{"jab_join_jconf",         (cmd_function)xj_join_jconf,         

+			0, 0, 0, REQUEST_ROUTE},

+	{"jab_exit_jconf",         (cmd_function)xj_exit_jconf,

+			0, 0, 0, REQUEST_ROUTE},

+	{"jab_go_online",          (cmd_function)xj_go_online,

+			0, 0, 0, REQUEST_ROUTE},

+	{"jab_go_offline",         (cmd_function)xj_go_offline,

+			0, 0, 0, REQUEST_ROUTE},

+	{"jab_register_watcher",   (cmd_function)xj_register_watcher,   

+			XJ_NO_SCRIPT_F, 0, 0, 0            },

+	{"jab_unregister_watcher", (cmd_function)xj_unregister_watcher,

+			XJ_NO_SCRIPT_F, 0, 0, 0            },

+	{"load_xjab",              (cmd_function)load_xjab,

+			XJ_NO_SCRIPT_F, 0, 0, 0            },

 	{0, 0, 0, 0, 0, 0}

 };

@@ -60,7 +60,6 @@ xj_pres_cell xj_pres_cell_new(void);

 void xj_pres_cell_free(xj_pres_cell);

 void xj_pres_cell_free_all(xj_pres_cell);

 int xj_pres_cell_init(xj_pres_cell, str*, pa_callback_f, void*);

-int xj_pres_cell_init(xj_pres_cell, str*, pa_callback_f, void*);

 int xj_pres_cell_update(xj_pres_cell, pa_callback_f, void*);

 xj_pres_list xj_pres_list_init(void);

@@ -49,7 +49,6 @@

 #define ALLOC_SIZE 3000

 #define MAX_FORWARD 70

-extern struct tm_binds tmb;

 c_back_param* shm_dup_cbparam(subs_t* , subs_t*);

 void free_cbparam(c_back_param* cb_param);

@@ -94,8 +94,6 @@ struct sl_binds slb;

 static int mod_init(void);

 static int child_init(int);

 void destroy(void);

-int handle_publish(struct sip_msg*, char*, char*);

-int handle_subscribe(struct sip_msg*, char*, char*);

 int stored_pres_info(struct sip_msg* msg, char* pres_uri, char* s);

 static int fixup_presence(void** param, int param_no);

 struct mi_root* mi_refreshWatchers(struct mi_root* cmd, void* param);

@@ -44,10 +44,6 @@

 #include "hash.h"

 #include "utils_func.h"

-extern int use_db;

-extern char* presentity_table;

-extern db_con_t* pa_db;

-extern db_func_t pa_dbf;

 static str pu_200_rpl  = str_init("OK");

 static str pu_412_rpl  = str_init("Conditional request failed");

@@ -44,12 +44,7 @@

 #include "publish.h"

 #include "presentity.h"

-extern db_con_t* pa_db;

-extern db_func_t pa_dbf;

 extern gen_lock_set_t* set;

-extern int counter ;

-extern int pid;

-extern int startup_time;

 static str pu_400a_rpl = str_init("Bad request");

 static str pu_400b_rpl = str_init("Invalid request");

@@ -38,11 +38,10 @@

 #include "notify.h"

 #include "../pua/hash.h"

-int get_stored_info(struct sip_msg* msg, subs_t* subs, int* error_ret, str* reply_str);

-int get_database_info(struct sip_msg* msg, subs_t* subs, int* error_ret, str* reply_str);

-int refresh_watcher(str* pres_uri, str* watcher_uri, str* event, 

-		int status, str* reason);

-

+int get_stored_info(struct sip_msg* msg, subs_t* subs, int* error_ret,

+		str* reply_str);

+int get_database_info(struct sip_msg* msg, subs_t* subs, int* error_ret,

+		str* reply_str);

 int get_db_subs_auth(subs_t* subs, int* found);

 int insert_db_subs_auth(subs_t* subs);

@@ -42,7 +42,6 @@

 #include "presence_xml.h"

 static str pu_415_rpl  = str_init("Unsupported media type");

-extern add_event_t pres_add_event;

 int xml_add_events(void)

 {

@@ -32,6 +32,7 @@

 #include "../../db/db.h"

 #include "../sl/sl_api.h"

 #include "../presence/event_list.h"

+#include "../presence/presence.h"

 #include "../xcap_client/xcap_functions.h"

 typedef struct xcap_serv

@@ -51,7 +52,4 @@ extern int integrated_xcap_server;

 extern xcap_serv_t* xs_list;

 extern xcapGetNewDoc_t xcap_GetNewDoc;

-/* SL bind */

-extern struct sl_binds slb;

-

 #endif

@@ -77,9 +77,6 @@ static int mod_init(void);

 static int child_init(int);

 static void destroy(void);

-int send_subscribe(subs_info_t*);

-int send_publish(publ_info_t*);

-

 int update_pua(ua_pres_t* p, unsigned int hash_code);

 ua_pres_t* build_upsubs_cbparam(ua_pres_t* pres);

 ua_pres_t* build_uppubl_cbparam(ua_pres_t* p);

@@ -32,14 +32,12 @@

 #include "../pua/pua_bind.h"

 extern int is_bla_aor;

-extern str default_domain;

 extern str header_name;

 extern str outbound_proxy;

 extern send_publish_t pua_send_publish;

 extern send_subscribe_t pua_send_subscribe;

 extern query_dialog_t pua_is_dialog;

-extern query_dialog_t pua_is_dialog;

 extern int bla_handle_notify(struct sip_msg* msg, char* s1, char* s2);

 #endif

@@ -33,7 +33,6 @@

 #include "registrar_cb.h"

 #include "pua_bla.h"

-extern int is_bla_aor;

 void bla_cb(ucontact_t* c, int type, void* param)

 {

@@ -64,10 +64,7 @@ static int child_init(int);

 static void destroy(void);

 int pua_set_publish(struct sip_msg* , char*, char*);

-void ul_publish(ucontact_t* c, int type, void* param);

-send_publish_t pua_send_publish;

-send_subscribe_t pua_send_subscribe;

 static cmd_export_t cmds[]=

 {

@@ -31,7 +31,5 @@ send_subscribe_t pua_send_subscribe;

 void ul_publish(ucontact_t* c, int type, void* param);

 int pua_unset_publish(struct sip_msg* msg , void* param);

-extern int pua_ul_publish; 

-extern str default_domain;

 extern str pres_prefix;

 #endif

@@ -81,8 +81,6 @@ xmlNodeGetNodeContentByName_t XMLNodeGetNodeContentByName;

 static int mod_init(void);

 static int child_init(int);

-int Notify2Xmpp(struct sip_msg* , char*, char*);

-void pres_Xmpp2Sip(char* xmpp_msg, int type, void *param);

 static int fixup_pua_xmpp(void** param, int param_no);

 static cmd_export_t cmds[]=

@@ -34,8 +34,6 @@

 #include "../xmpp/xmpp_api.h"

-extern struct tm_binds tmb;

-

 extern send_subscribe_t pua_send_subscribe;

 extern send_publish_t pua_send_publish;

 extern query_dialog_t pua_is_dialog;

@@ -64,9 +64,6 @@ str* constr_multipart_body(db_res_t* result,char** cid_array,

 dlg_t* rls_notify_dlg(subs_t* subs);

-int rls_send_notify(subs_t* subs, str* body, char* start_cid,

-		char* boudary_string);

-dlg_t* rls_notify_dlg(subs_t* subs);

 void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps);

@@ -53,10 +53,6 @@ extern int xmpp_send_sip_msg(char *from, char *to, char *msg);

 extern void xmpp_free_pipe_cmd(struct xmpp_pipe_cmd *cmd);

 /* util.c */

-char *decode_uri_sip_xmpp(char *uri);

-char *encode_uri_sip_xmpp(char *uri);

-char *decode_uri_xmpp_sip(char *jid);

-char *encode_uri_xmpp_sip(char *jid);

 char *extract_domain(char *jid);

 char *random_secret(void);

 char *db_key(char *secret, char *domain, char *id);