Changeset 438:e7814e24e57b in freeDiameter for extensions/app_diameap/diameap_mysql.c

Timestamp:

Jul 28, 2010, 3:59:39 PM (14 years ago)

Author:

Souheil Ben Ayed <souheil@tera.ics.keio.ac.jp>

Branch:

default

Phase:

public

Message:

Corrected compilation warnings on app_diameap

File:

• extensions/app_diameap/diameap_mysql.c (modified) (9 diffs)

extensions/app_diameap/diameap_mysql.c

@@ -38 +38 @@
 #include "diameap_mysql.h"
 
+static pthread_mutex_t db_cs_mutex =
+PTHREAD_MUTEX_INITIALIZER;
+
 int diameap_get_eap_user(struct eap_user * user, char * username)
 {
@@ -44 +47 @@
         {
                 TRACE_DEBUG(INFO, "%sNot connected to the MySQL Database server.",DIAMEAP_EXTENSION);
-                if (diameap_mysql_reconnect())
-                {
-                        return EINVAL;
-                }
+
+                return EINVAL;
+
         }
         mysql_thread_init();
@@ -67 +69 @@
                 CHECK_POSIX(pthread_mutex_unlock( &db_cs_mutex ));
                 TRACE_DEBUG(INFO, "%sQuery execution fail. %s",DIAMEAP_EXTENSION, mysql_error(db_conn));
-                db_conn = NULL;
-                diameap_mysql_reconnect();
                 mysql_thread_end();
                 free(query);
@@ -83 +83 @@
 
                 user->id = atoi(row[0]);
-                user->userid = strdup(row[1]);
+                memcpy(user->userid,row[1],strlen(row[1]));
                 user->useridLength = strlen(row[1]);
-                user->password = strdup(row[2]);
+                memcpy(user->password, row[2],strlen(row[2]));
                 user->passwordLength = strlen(row[2]);
                 user->proposed_eap_method = atoi(row[3]);
@@ -115 +115 @@
         {
                 TRACE_DEBUG(INFO, "%sNot connected to the MySQL Database server.",DIAMEAP_EXTENSION);
-                if (diameap_mysql_reconnect())
-                {
-                        return EINVAL;
-                }
+
+                return EINVAL;
+
         }
 
@@ -138 +137 @@
                 CHECK_POSIX(pthread_mutex_unlock( &db_cs_mutex ));
                 TRACE_DEBUG(INFO, "%sQuery execution fail. %s",DIAMEAP_EXTENSION, mysql_error(db_conn));
-                db_conn = NULL;
-                diameap_mysql_reconnect();
                 mysql_thread_end();
                 free(query);
@@ -178 +175 @@
         {
                 TRACE_DEBUG(INFO, "%sNot connected to the MySQL Database server.",DIAMEAP_EXTENSION);
-                if (diameap_mysql_reconnect())
-                {
-                        return EINVAL;
-                }
+
+                return EINVAL;
+
         }
 
@@ -202 +198 @@
                 CHECK_POSIX(pthread_mutex_unlock( &db_cs_mutex ));
                 TRACE_DEBUG(INFO, "%sQuery execution fail. %s",DIAMEAP_EXTENSION, mysql_error(db_conn));
-                db_conn = NULL;
-                diameap_mysql_reconnect();
                 mysql_thread_end();
                 free(query);
@@ -233 +227 @@
 }
 
-void diameap_mysql_disconnect(){
+void diameap_mysql_disconnect()
+{
         mysql_close(db_conn);
 }