Browse code

core, lib, modules: restructured source code tree

- new folder src/ to hold the source code for main project applications
- main.c is in src/
- all core files are subfolder are in src/core/
- modules are in src/modules/
- libs are in src/lib/
- application Makefiles are in src/
- application binary is built in src/ (src/kamailio)

Daniel-Constantin Mierla authored on 07/12/2016 11:03:51
Showing 1 changed files
1 1
deleted file mode 100644
... ...
@@ -1,49 +0,0 @@
1
-/* 
2
- * Copyright (C) 2001-2003 FhG Fokus
3
- * Copyright (C) 2008 1&1 Internet AG
4
- *
5
- * This file is part of Kamailio, a free SIP server.
6
- *
7
- * Kamailio is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License as published by
9
- * the Free Software Foundation; either version 2 of the License, or
10
- * (at your option) any later version
11
- *
12
- * Kamailio is distributed in the hope that it will be useful,
13
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- * GNU General Public License for more details.
16
- *
17
- * You should have received a copy of the GNU General Public License 
18
- * along with this program; if not, write to the Free Software 
19
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
20
- */
21
-
22
-/*! \file
23
- *  \brief DB_MYSQL :: Data conversions
24
- *  \ingroup db_mysql
25
- *  Module: \ref db_mysql
26
- */
27
-
28
-
29
-#ifndef KM_VAL_H
30
-#define KM_VAL_H
31
-
32
-#include <mysql.h>
33
-#include "../../lib/srdb1/db_val.h"
34
-#include "../../lib/srdb1/db.h"
35
-
36
-
37
-/*!
38
- * \brief Converting a value to a string
39
- *
40
- * Converting a value to a string, used when converting result from a query
41
- * \param _c database connection
42
- * \param _v source value
43
- * \param _s target string
44
- * \param _len target string length
45
- * \return 0 on success, negative on error
46
- */
47
-int db_mysql_val2str(const db1_con_t* _con, const db_val_t* _v, char* _s, int* _len);
48
-
49
-#endif
Browse code

db_mysql: updated include paths for libmysqlclient

- direct use of mysql_config, the old substitution done in module
Makefile can break the includes of libmysqlclient files
- reported by Ian Yu-Hsun Lin, GH#419

Daniel-Constantin Mierla authored on 26/11/2015 23:03:26
Showing 1 changed files
... ...
@@ -29,7 +29,7 @@
29 29
 #ifndef KM_VAL_H
30 30
 #define KM_VAL_H
31 31
 
32
-#include <mysql/mysql.h>
32
+#include <mysql.h>
33 33
 #include "../../lib/srdb1/db_val.h"
34 34
 #include "../../lib/srdb1/db.h"
35 35
 
Browse code

db_mysql: Remove SVN ID's, remove history sections

Olle E. Johansson authored on 11/03/2015 15:26:21
Showing 1 changed files
... ...
@@ -1,6 +1,4 @@
1 1
 /* 
2
- * $Id$ 
3
- *
4 2
  * Copyright (C) 2001-2003 FhG Fokus
5 3
  * Copyright (C) 2008 1&1 Internet AG
6 4
  *
Browse code

all: updated FSF address in GPL text

Anthony Messina authored on 04/07/2014 09:36:37 • Daniel-Constantin Mierla committed on 04/07/2014 09:37:36
Showing 1 changed files
... ...
@@ -18,7 +18,7 @@
18 18
  *
19 19
  * You should have received a copy of the GNU General Public License 
20 20
  * along with this program; if not, write to the Free Software 
21
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
21
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
22 22
  */
23 23
 
24 24
 /*! \file
Browse code

modules: several small doxygen bug fixes

Henning Westerholt authored on 04/09/2011 20:13:23
Showing 1 changed files
... ...
@@ -23,7 +23,6 @@
23 23
 
24 24
 /*! \file
25 25
  *  \brief DB_MYSQL :: Data conversions
26
- *  \ref val.c
27 26
  *  \ingroup db_mysql
28 27
  *  Module: \ref db_mysql
29 28
  */
Browse code

db_con renamed to db1_con in files originating from kamailio/db_mysql.

The structure db_con has been renamed in lib/srdb1 to db1_con, thus we
need to change the name of the structure in all files originating from
kamailio/modules/db_mysql (and using lib/srdb1).

Jan Janak authored on 16/02/2009 22:09:32
Showing 1 changed files
... ...
@@ -47,6 +47,6 @@
47 47
  * \param _len target string length
48 48
  * \return 0 on success, negative on error
49 49
  */
50
-int db_mysql_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* _len);
50
+int db_mysql_val2str(const db1_con_t* _con, const db_val_t* _v, char* _s, int* _len);
51 51
 
52 52
 #endif
Browse code

Integration of both modules, first step.

* Defines protecting header files from double inclusion fixed to match
filenames.
* Linked the module also with srdb1
* Fixed path to header files in lib/srdb1.
* Filenames of local included header files prefixed with km_ to match
their real filenames

Jan Janak authored on 16/02/2009 21:58:33
Showing 1 changed files
... ...
@@ -29,12 +29,12 @@
29 29
  */
30 30
 
31 31
 
32
-#ifndef VAL_H
33
-#define VAL_H
32
+#ifndef KM_VAL_H
33
+#define KM_VAL_H
34 34
 
35 35
 #include <mysql/mysql.h>
36
-#include "../../db/db_val.h"
37
-#include "../../db/db.h"
36
+#include "../../lib/srdb1/db_val.h"
37
+#include "../../lib/srdb1/db.h"
38 38
 
39 39
 
40 40
 /*!
Browse code

- move db_mysql and db_unixodbc str2val implementation to the DB core, remove the duplicated implementation in the modules (preparation for query copy problem) - introduced a small regression for the unixodbc in the NULL value handling that needs to be fixed

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5322 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 10/12/2008 18:41:09
Showing 1 changed files
... ...
@@ -37,19 +37,6 @@
37 37
 #include "../../db/db.h"
38 38
 
39 39
 
40
-/*!
41
- * \brief Convert a str to a db value, does not copy strings
42
- *
43
- * Convert a str to a db value, does not copy strings.
44
- * \param _t destination value type
45
- * \param _v destination value
46
- * \param _s source string
47
- * \param _l string length
48
- * \return 0 on success, negative on error
49
- */
50
-int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l);
51
-
52
-
53 40
 /*!
54 41
  * \brief Converting a value to a string
55 42
  *
Browse code

- add a comment about the NULL value behaviour of libmysql - add some doxygen documentation

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5197 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 13/11/2008 16:14:34
Showing 1 changed files
... ...
@@ -22,7 +22,7 @@
22 22
  */
23 23
 
24 24
 /*! \file
25
- *  \brief DB_MYSQL :: Conversions
25
+ *  \brief DB_MYSQL :: Data conversions
26 26
  *  \ref val.c
27 27
  *  \ingroup db_mysql
28 28
  *  Module: \ref db_mysql
... ...
@@ -37,15 +37,29 @@
37 37
 #include "../../db/db.h"
38 38
 
39 39
 
40
-/**
41
- * Does not copy strings
40
+/*!
41
+ * \brief Convert a str to a db value, does not copy strings
42
+ *
43
+ * Convert a str to a db value, does not copy strings.
44
+ * \param _t destination value type
45
+ * \param _v destination value
46
+ * \param _s source string
47
+ * \param _l string length
48
+ * \return 0 on success, negative on error
42 49
  */
43 50
 int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l);
44 51
 
45 52
 
46
-/**
47
- * Used when converting result from a query
53
+/*!
54
+ * \brief Converting a value to a string
55
+ *
56
+ * Converting a value to a string, used when converting result from a query
57
+ * \param _c database connection
58
+ * \param _v source value
59
+ * \param _s target string
60
+ * \param _len target string length
61
+ * \return 0 on success, negative on error
48 62
  */
49 63
 int db_mysql_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* _len);
50 64
 
51
-#endif /* VAL_H */
65
+#endif
Browse code

- change name in copyright headers

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4518 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 28/07/2008 15:39:28
Showing 1 changed files
... ...
@@ -4,14 +4,14 @@
4 4
  * Copyright (C) 2001-2003 FhG Fokus
5 5
  * Copyright (C) 2008 1&1 Internet AG
6 6
  *
7
- * This file is part of openser, a free SIP server.
7
+ * This file is part of Kamailio, a free SIP server.
8 8
  *
9
- * openser is free software; you can redistribute it and/or modify
9
+ * Kamailio is free software; you can redistribute it and/or modify
10 10
  * it under the terms of the GNU General Public License as published by
11 11
  * the Free Software Foundation; either version 2 of the License, or
12 12
  * (at your option) any later version
13 13
  *
14
- * openser is distributed in the hope that it will be useful,
14
+ * Kamailio is distributed in the hope that it will be useful,
15 15
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 16
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17 17
  * GNU General Public License for more details.
Browse code

- small doxygen updates (group, syntax), small docs update - patch provided from Olle E. Johansson, closes #2025079

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4505 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 24/07/2008 15:20:11
Showing 1 changed files
... ...
@@ -21,6 +21,14 @@
21 21
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
22 22
  */
23 23
 
24
+/*! \file
25
+ *  \brief DB_MYSQL :: Conversions
26
+ *  \ref val.c
27
+ *  \ingroup db_mysql
28
+ *  Module: \ref db_mysql
29
+ */
30
+
31
+
24 32
 #ifndef VAL_H
25 33
 #define VAL_H
26 34
 
Browse code

- convert existing documentation to doxygen format - add some comments, some smaller cleanups - small adjustment of the fetch_result function to the postgres one, add one DBG message, renames a parameter

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4124 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 07/05/2008 16:36:48
Showing 1 changed files
... ...
@@ -29,13 +29,13 @@
29 29
 #include "../../db/db.h"
30 30
 
31 31
 
32
-/*
32
+/**
33 33
  * Does not copy strings
34 34
  */
35 35
 int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l);
36 36
 
37 37
 
38
-/*
38
+/**
39 39
  * Used when converting result from a query
40 40
  */
41 41
 int db_mysql_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* _len);
Browse code

- rename database modules to use the 'db_' prefix

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 06/02/2008 13:10:03
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,43 @@
1
+/* 
2
+ * $Id$ 
3
+ *
4
+ * Copyright (C) 2001-2003 FhG Fokus
5
+ * Copyright (C) 2008 1&1 Internet AG
6
+ *
7
+ * This file is part of openser, a free SIP server.
8
+ *
9
+ * openser is free software; you can redistribute it and/or modify
10
+ * it under the terms of the GNU General Public License as published by
11
+ * the Free Software Foundation; either version 2 of the License, or
12
+ * (at your option) any later version
13
+ *
14
+ * openser is distributed in the hope that it will be useful,
15
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
+ * GNU General Public License for more details.
18
+ *
19
+ * You should have received a copy of the GNU General Public License 
20
+ * along with this program; if not, write to the Free Software 
21
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
22
+ */
23
+
24
+#ifndef VAL_H
25
+#define VAL_H
26
+
27
+#include <mysql/mysql.h>
28
+#include "../../db/db_val.h"
29
+#include "../../db/db.h"
30
+
31
+
32
+/*
33
+ * Does not copy strings
34
+ */
35
+int db_mysql_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l);
36
+
37
+
38
+/*
39
+ * Used when converting result from a query
40
+ */
41
+int db_mysql_val2str(const db_con_t* _con, const db_val_t* _v, char* _s, int* _len);
42
+
43
+#endif /* VAL_H */