Module: sip-router
Branch: master
Commit: fc1f1b750f911f7fa2d453f6ce61f011844536a9
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc1f1b7…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Thu Apr 4 00:37:22 2013 +0100
modules/outbound: a bit of tidying up
---
modules/outbound/config.c | 25 +++++++++++++------------
modules/outbound/config.h | 15 ++++++++++-----
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/modules/outbound/config.c b/modules/outbound/config.c
index 6c90a04..bcb6fbb 100644
--- a/modules/outbound/config.c
+++ b/modules/outbound/config.c
@@ -1,19 +1,20 @@
/*
* $Id$
- * This file is part of SIP-router, a free SIP server.
*
- * SIP-router is free software; you can redistribute it and/or modify
+ * 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
*
- * SIP-router is distributed in the hope that it will be useful,
+ * 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
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
@@ -25,18 +26,18 @@
*/
#include "../../cfg/cfg.h"
-#include "../../parser/msg_parser.h" /* method types */
-
#include "config.h"
struct cfg_group_outbound default_outbound_cfg = {
0, /* Read only variable to mark if outbound is enabled */
- };
+};
+
+void *outbound_cfg = &default_outbound_cfg;
-void *outbound_cfg = &default_outbound_cfg;
+cfg_def_t outbound_cfg_def[] = {
+ { "outbound_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY,
+ 0, 0, 0, 0,
+ "If set to one (true) Outbound is enabled." },
-cfg_def_t outbound_cfg_def[] = {
- {"outbound_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY, 0, 0, 0, 0,
- "If set to one (true) Outbound is enabled."},
{0, 0, 0, 0, 0, 0}
};
diff --git a/modules/outbound/config.h b/modules/outbound/config.h
index a2cea4c..0410ff5 100644
--- a/modules/outbound/config.h
+++ b/modules/outbound/config.h
@@ -1,7 +1,14 @@
/*
* $Id$
*
- * SIP-router is distributed in the hope that it will be useful,
+ * 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.
@@ -9,6 +16,7 @@
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
*/
/*!
@@ -21,10 +29,7 @@
#ifndef _OUTBOUND_CONFIG_H
#define _OUTBOUND_CONFIG_H
-#include "../../qvalue.h"
-
#include "../../cfg/cfg.h"
-#include "../../str.h"
struct cfg_group_outbound {
int outbound_active;
@@ -34,4 +39,4 @@ extern struct cfg_group_outbound default_outbound_cfg;
extern void *outbound_cfg;
extern cfg_def_t outbound_cfg_def[];
-#endif
+#endif /* _OUTBOUND_CONFIG_H */
Module: sip-router
Branch: master
Commit: 91b357872f06e988fd09003cffc02742d2731ce3
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91b3578…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Thu Apr 4 00:38:25 2013 +0100
modules/stun: added read-only stun_active cfg value
---
modules/stun/config.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
modules/stun/config.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
modules/stun/stun_mod.c | 8 ++++++++
3 files changed, 97 insertions(+), 0 deletions(-)
diff --git a/modules/stun/config.c b/modules/stun/config.c
new file mode 100644
index 0000000..422d376
--- /dev/null
+++ b/modules/stun/config.c
@@ -0,0 +1,45 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2013 Crocodile RCS Ltd
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/*!
+ * \file
+ * \brief STUN :: Configuration
+ * \ingroup stun
+ */
+
+#include "../../cfg/cfg.h"
+#include "config.h"
+
+struct cfg_group_stun default_stun_cfg = {
+ 0, /* Read only variable to mark if stun is enabled */
+ };
+
+void *stun_cfg = &default_stun_cfg;
+
+cfg_def_t stun_cfg_def[] = {
+ { "stun_enabled", CFG_VAR_INT | CFG_ATOMIC | CFG_READONLY,
+ 0, 0, 0, 0,
+ "If set to one (true) STUN is enabled." },
+
+ {0, 0, 0, 0, 0, 0}
+};
diff --git a/modules/stun/config.h b/modules/stun/config.h
new file mode 100644
index 0000000..2855e54
--- /dev/null
+++ b/modules/stun/config.h
@@ -0,0 +1,44 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2013 Crocodile RCS Ltd
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/*!
+ * \file
+ * \brief STUN :: Configuration Framework support
+ * \ingroup stun
+ */
+
+
+#ifndef _STUN_CONFIG_H
+#define _STUN_CONFIG_H
+
+#include "../../cfg/cfg.h"
+
+struct cfg_group_stun {
+ int stun_active;
+};
+
+extern struct cfg_group_stun default_stun_cfg;
+extern void *stun_cfg;
+extern cfg_def_t stun_cfg_def[];
+
+#endif /* _STUN_CONFIG_H */
diff --git a/modules/stun/stun_mod.c b/modules/stun/stun_mod.c
index 5797de6..ae1c981 100644
--- a/modules/stun/stun_mod.c
+++ b/modules/stun/stun_mod.c
@@ -26,6 +26,7 @@
#include "../../ip_addr.h"
#include "../../sr_module.h"
#include "kam_stun.h"
+#include "config.h"
MODULE_VERSION
@@ -56,6 +57,13 @@ static int mod_init(void)
return -1;
}
+ if (cfg_declare("stun", stun_cfg_def, &default_stun_cfg,
+ cfg_sizeof(stun), &stun_cfg)) {
+ LM_ERR("declaring config framework variable\n");
+ return -1;
+ }
+ default_stun_cfg.stun_active = 1;
+
return 0;
}
Module: sip-router
Branch: master
Commit: fe912bc27e41906902f5d25838eac95304c332eb
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe912bc…
Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com>
Date: Thu Apr 4 00:22:49 2013 +0100
modules/websocket: moved config framework stuff to separate files
- To facilitate docbook
---
modules/websocket/config.c | 56 ++++++++++++++++++++++++++++++++++++++++++++
modules/websocket/config.h | 46 ++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 0 deletions(-)
diff --git a/modules/websocket/config.c b/modules/websocket/config.c
new file mode 100644
index 0000000..e6e6a50
--- /dev/null
+++ b/modules/websocket/config.c
@@ -0,0 +1,56 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2012-2013 Crocodile RCS Ltd
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/*!
+ * \file
+ * \brief WebSocket :: Configuration
+ * \ingroup WebSocket
+ */
+
+#include "../../cfg/cfg.h"
+#include "ws_frame.h"
+#include "config.h"
+
+struct cfg_group_websocket default_ws_cfg =
+{
+ DEFAULT_KEEPALIVE_TIMEOUT, /* keepalive_timeout */
+ 1 /* enabled */
+};
+
+void *ws_cfg = &default_ws_cfg;
+
+cfg_def_t ws_cfg_def[] =
+{
+ /* ws_frame.c */
+ { "keepalive_timeout", CFG_VAR_INT | CFG_ATOMIC,
+ 0, 0, 0, 0,
+ "Time (in seconds) after which to send a keep-alive on idle"
+ " WebSocket connections." },
+
+ /* ws_handshake.c */
+ { "enabled", CFG_VAR_INT | CFG_ATOMIC,
+ 0, 0, 0, 0,
+ "Shows whether WebSockets are enabled or not." },
+
+ { 0, 0, 0, 0, 0, 0 }
+};
diff --git a/modules/websocket/config.h b/modules/websocket/config.h
new file mode 100644
index 0000000..f053dbc
--- /dev/null
+++ b/modules/websocket/config.h
@@ -0,0 +1,46 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2012-2013 Crocodile RCS Ltd
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+/*!
+ * \file
+ * \brief WebSocket :: Configuration Framework support
+ * \ingroup WebSocket
+ */
+
+#ifndef _WS_CONFIG_H
+#define _WS_CONFIG_H
+
+#include "../../qvalue.h"
+#include "../../str.h"
+#include "../../cfg/cfg.h"
+
+struct cfg_group_websocket
+{
+ int keepalive_timeout;
+ int enabled;
+};
+extern struct cfg_group_websocket default_ws_cfg;
+extern void *ws_cfg;
+extern cfg_def_t ws_cfg_def[];
+
+#endif /* _WS_CONFIG_H */