:Merge branch 'clean_real' of https://gitlab.irap.omp.eu/CDPP/DDServer into clean_real

Alexandre Schulz
2 parents 8a202732 bc7f6858
Showing 4 changed files with 89 additions and 55 deletions Show diff stats
src/SERVER/DD_Access_sr.c
src/SERVER/DD_GetData.c
src/SERVER/DD_Server.c
src/SERVER/request.c
@@ -39,39 +39,48 @@ int * get_ticket_field_ids(int ncid, int n, char ** fields) {
     return a;
 }
 int GetTicket(int user_id, char * hostname, int DD_user_id) {
-    //printf("GetTicket uid:%i, hostname:%s, ddid:%i\n", user_id, hostname, DD_user_id);
+    printf("GetTicket uid:%i, hostname:%s, ddid:%i\n", user_id, hostname, DD_user_id);
     time_t expiration_time;
     time_t clock_value;
     int permission = NOPERMISSION;
+    printf("NOPERMISSION value : %i\n", permission);
     clock_value = time(NULL);
-     //  expiration_time= clock_value+16200;  // 4.5 hours
+    //  expiration_time= clock_value+16200;  // 4.5 hours
     expiration_time = clock_value+172800;  // 48 hours
+    expiration_time = clock_value + 16200;
+    printf("Expiration time : %ld\n", expiration_time);
     // selection query
     char * q = malloc(1024 * sizeof(char));
     memset(q, 0, 1024);
-    sprintf(q, "SELECT ddid,hostname,time FROM user_ticket WHERE userid='%s' AND hostname='%s';", hostname);
+    sprintf(q, "SELECT ddid,hostname,time FROM user_ticket WHERE userid=%i AND hostname='%s';",user_id, hostname);
+    printf("GetTicket select : -%s-\n", q);
     sqlite3 * db;
     sqlite3_stmt * res;
     sqlite3_open("amda.db", &db);
     int rc; rc = sqlite3_prepare_v2(db, q, -1, &res, 0);
     int step; step = sqlite3_step(res);
     if(step != SQLITE_ROW) {
+        printf("No user ticket row found\n");
         // create a new entry in the database
         char * q = malloc(1024 * sizeof(char));
         memset(q, 0, 1024);
+        printf("\tinsert user_id: %i, host: %s, time: %ld, ddid: %i\n", user_id, hostname, expiration_time, DD_user_id);
         sprintf(q, "INSERT INTO user_ticket (userid,hostname,time,ddid) VALUES (%i,'%s',%i,%i);",user_id,hostname,expiration_time,DD_user_id);
         execute_query(q);
         permission = 0;
         free(q);
     }
     else {
+        printf("Row found\n");
         while(step == SQLITE_ROW) {
             int time_tmp; time_tmp = sqlite3_column_int(res, 2);
             int ddid_tmp; ddid_tmp = sqlite3_column_int(res, 0);
+            printf("\ttime_tmp: %i, ddid_tmp: %i, DD_user_id: %i\n", time_tmp, ddid_tmp, DD_user_id);
             if(ddid_tmp==DD_user_id) {
-                if(time_tmp<expiration_time) {
+                printf("Expiration time : %ld, t_diff: %ld\n", expiration_time, time_tmp - expiration_time);
+                if(clock_value<time_tmp) {
                     // update expiration time
                     char * q = malloc(1024 * sizeof(char));
                     memset(q,0,1024);
@@ -79,6 +88,7 @@ int GetTicket(int user_id, char * hostname, int DD_user_id) {
                     execute_query(q);
                     free(q);
                 }
+                
                 permission = 0; 
                 break;
             }
@@ -88,6 +98,7 @@ int GetTicket(int user_id, char * hostname, int DD_user_id) {
     sqlite3_finalize(res);
     sqlite3_close(db);
+    printf("Permission val : %i\n", permission);
     return permission;
 }      
@@ -160,7 +171,7 @@ int CheckTicket(char * username, char * ticket) {
  *   It IS DD_Check !
  */
 int ShowTicket_old(int user_id, char *hostname, char * ddname) {
-    //printf("ShowTicket : user_id:%i, hostname:'%s', ddname:'%s'\n", user_id, hostname, ddname);
+    printf("ShowTicket : user_id:%i, hostname:'%s', ddname:'%s'\n", user_id, hostname, ddname);
     char * ddbase;
     char refname[PATHLENGTH];
     int ticket_id;    /* Ticket file ID */
@@ -241,7 +252,7 @@ int ShowTicket_old(int user_id, char *hostname, char * ddname) {
 int ShowTicket(int user_id, char *hostname, char * ddname) {
-    //printf("ShowTicket2 : uid:%i, hostname:%s, ddname:%s\n", user_id, hostname, ddname);
+    printf("ShowTicket2 : uid:%i, hostname:%s, ddname:%s\n", user_id, hostname, ddname);
     time_t expiration_time;
     time_t clock_value;
     int permission = NOPERMISSION;
@@ -251,35 +262,50 @@ int ShowTicket(int user_id, char *hostname, char * ddname) {
     clock_value = time(NULL);
      //  expiration_time= clock_value+16200;  // 4.5 hours
-    expiration_time = clock_value+172800;  // 48 hours
+    //expiration_time = clock_value+172800;  // 48 hours
+    expiration_time = clock_value + 16200;
     // selection query
     char * q = malloc(1024 * sizeof(char));
     memset(q, 0, 1024);
     sprintf(q, "SELECT ddid,hostname,time FROM user_ticket WHERE userid=%i AND hostname='%s';", user_id,hostname);
-    //printf("query : %s\n", q);
+    printf("query : -%s-\n", q);
     sqlite3 * db;
     sqlite3_stmt * res;
     sqlite3_open("amda.db", &db);
     int rc; rc = sqlite3_prepare_v2(db, q, -1, &res, 0);
     int step; step = sqlite3_step(res);
     if(step != SQLITE_ROW) {
+        printf("\tno row found\n");
         // create a new entry in the database
-        //printf("STEP FAIL\n");
         permission = NOPERMISSION;
     }
     else {
+        printf("\trow found\n");
         while(step == SQLITE_ROW) {
             int time_tmp; time_tmp = sqlite3_column_int(res, 2);
             int ddid_tmp; ddid_tmp = sqlite3_column_int(res, 0);
-            //printf("\t->row found : ddid %i, time %i, cv: %i\n", ddid_tmp, time_tmp, clock_value);
-            //printf("\tdduserid : %i\n", DD_user_id);
+            printf("\t->row found : ddid %i, time %i, cv: %i\n", ddid_tmp, time_tmp, clock_value);
+            printf("\tdduserid : %i\n", DD_user_id);
             if(ddid_tmp==DD_user_id) {
                 if(clock_value < time_tmp) {
                     // update expiration time
+                    printf("\tclock_value < time_tmp : %ld < %ld\n", clock_value, time_tmp);
+                    printf("\tdiff : %ld\n", clock_value - time_tmp);
                     permission = 0;
                 }
                 else {
+                    printf("\tExpired ticket ?? %ld < %ld\n", clock_value, time_tmp);
+                    printf("\t%ld\n", clock_value - time_tmp);
+                    // remove ticket entry from table
+                    char * qq = malloc(1024 * sizeof(char));
+                    memset(qq, 0, 1024);
+                    sprintf(qq, "DELETE FROM user_ticket WHERE userid=%i AND hostname='%s' AND time=%ld;", user_id,hostname,time_tmp);
+                    printf("DELETE q : -%s-\n", qq);
+                    sqlite3_exec(db, qq, 0, 0, NULL);
+                    printf("FREEEEEEEEE\n");
+                    free(qq);
+
                     permission = NOPERMISSION;
                 }
                 break;
@@ -19,6 +19,7 @@ extern LocalOrigSync(DD_Var_t *Local, DD_Var_t *Orig);
  * Fill General attributes fron the INFO file
  */
 int OpenInstr(char *VInstrName) {
+    //printf("OpenInstr : Vi name : %s\n", VInstrName);
     char refname[PATHLENGTH]; /* full name of the reference file */
     char *ddbase;              /* Environment variable DDBASE (path to the DDBASE ROOT)*/
     char RInstrName[MAXSETLENGTH]; /* Requested virtual instrument name */
@@ -41,6 +42,7 @@ int OpenInstr(char *VInstrName) {
     for(id = 0; id < MaxIDNumber; id++) {
         if(DD_Var[id] != NULL) {
             if(strcmp(RInstrName, DD_Var[id]->InstrName) == 0) {
+                //printf("VI is open at id : %i\n", id);
                 return(id);
             }
         }
@@ -50,12 +52,14 @@ int OpenInstr(char *VInstrName) {
     id =0;
     while((DD_Var[id] != NULL) && (id < MaxIDNumber)) id++;
     if(id >= MaxIDNumber) {
+        //printf("TOO many instruments open\n");
         return(TOOMANYREQ);      /* No room */
     }
     /* Open reference NC file */
     if((ddbase = getenv("DDBASE")) == NULL) return(NOREFFILE);
     strcpy(refname,ddbase);
     strcat(refname,REFNAME);
+    //printf("Openning nc file %s\n", refname);
     status = nc_open(refname, NC_NOWRITE|NC_SHARE,&refID);
@@ -176,7 +180,7 @@ int OpenInstr(char *VInstrName) {
  * Closes this ID and return number of IDs remained in use
  */
 int CloseID(int ID) {
-    printf("\tclosing instrument %i\n", ID);
+    //printf("\tclosing instrument %i\n", ID);
     // TODO
     return 1;
     int status;
@@ -257,7 +257,7 @@ void pack_variables(XDR * xdrs, const DD_data_t * data, const u_int max_number) 
 }
 int send_var_data(const DD_data_t * data, const int socket_id, int last_flag) {
-    printf("\tDEBUG : send_var_data\n");
+    //printf("\tDEBUG : send_var_data\n");
     XDR xdrs;
     caddr_t buff;
     int max_number, packet_size;
@@ -265,9 +265,9 @@ int send_var_data(const DD_data_t * data, const int socket_id, int last_flag) {
     u_int n;
     max_number = get_max_number(data);
-    printf("\t\tmax_number : %i\n", max_number);
+    //printf("\t\tmax_number : %i\n", max_number);
     packet_size = get_packet_size(data);
-    printf("\t\tpacket_size : %i\n", packet_size);
+    //printf("\t\tpacket_size : %i\n", packet_size);
     if((error = PutHeader(data->type,
       		   data->DimNumber+1,
@@ -429,12 +429,12 @@ int get_table_name(char * instrument_name, char * out) {
 }
 int datatable_has_data(char * table_name, double start, double stop) {
-    printf("in datatable_has_data : table_name: %s, start: %f, stop : %f\n", table_name, start, stop);
+    //printf("in datatable_has_data : table_name: %s, start: %f, stop : %f\n", table_name, start, stop);
     int ans = 0, rc;
     char * query = malloc( 1024 * sizeof(char) );
     memset(query, 0, 1024);
     sprintf(query, "SELECT count(Time) FROM %s WHERE Time>=%f AND Time<%f;", table_name, start, stop);
-    printf("\t\t has data query : %s\n", query);
+    //printf("\t\t has data query : %s\n", query);
     sqlite3 * db;
     sqlite3_stmt * res;
     sqlite3_open("amda.db", &db);
@@ -442,15 +442,15 @@ int datatable_has_data(char * table_name, double start, double stop) {
     rc=sqlite3_step(res);
     if(rc==SQLITE_ROW) {
         ans = sqlite3_column_int(res, 0);
-        printf("row found : %i\n", ans);
+        //printf("row found : %i\n", ans);
     }
     else {
-        printf("no row found\n");
+        //printf("no row found\n");
     }
     sqlite3_finalize(res);
     sqlite3_close(db);
     free(query);
-    printf("before return : %i\n", ans);
+    //printf("before return : %i\n", ans);
     return ans;
 }
@@ -524,8 +524,7 @@ void log_ddvar(DD_Var_t * ddvar, char * filename) {
             int k; for(k=0;k<m;k++) {
                 fprintf(ptr, "%f,", ((double*)ddvar->VarData[i].Variables[j])[k]);
             }
-            fprintf(ptr, "\n");
-        }
+            fprintf(ptr, "\n"); }
         fprintf(ptr, "\n");
     }
@@ -534,8 +533,8 @@ void log_ddvar(DD_Var_t * ddvar, char * filename) {
 int get_data_from_table(char * table_name, struct RequestData * request) {
     int rc;
-    printf("\t\tinstrument start time : %f\n", get_instrument_time(request->instrument_id));
-    printf("\t\tinterval value        : %f\n", DD_Time2Double(request->time));
+    //printf("\t\tinstrument start time : %f\n", get_instrument_time(request->instrument_id));
+    //printf("\t\tinterval value        : %f\n", DD_Time2Double(request->time));
     double start_time = get_instrument_time(request->instrument_id);
     double stop_time, dt; dt = DD_Time2Double(request->time);
     stop_time = start_time + dt + 10;
@@ -562,7 +561,7 @@ int get_data_from_table(char * table_name, struct RequestData * request) {
     int i;for(i=0;i<request->variable_count;i++) {
         char * var_name = request->variable_names[i];
-        printf("\tVariable name: %s\n", var_name);
+        //printf("\tVariable name: %s\n", var_name);
         if( strcmp(var_name, "Time") != 0) {
             IntArray * p_dim=NULL; p_dim = get_parameter_dimension(var_name, table_name);
             if(p_dim!=NULL) {
@@ -580,8 +579,8 @@ int get_data_from_table(char * table_name, struct RequestData * request) {
                 }
                 else {
-                    printf("MUTLTIDIM DATA : Come back to this later\n");
-                    printf("\tp_dim : %i\n", p_dim->size);
+                    //printf("MUTLTIDIM DATA : Come back to this later\n");
+                    //printf("\tp_dim : %i\n", p_dim->size);
                 }
                 // set parameter data dimensions
@@ -708,13 +707,13 @@ void create_instrument_time_table() {
 }
 double get_instrument_time(int instrument_id) {
-    printf("in get_instrument_time id : %i\n", instrument_id);
+    //printf("in get_instrument_time id : %i\n", instrument_id);
     // selection query
     char * q = malloc(1024 * sizeof(char));
     double ans = -1;
     int rc;
     sprintf(q, "SELECT start FROM instrument_time WHERE id=%i LIMIT 1;", instrument_id);
-    printf("query : -%s-\n", q);
+    //printf("query : -%s-\n", q);
     sqlite3 * db;
     sqlite3_stmt * res;
     sqlite3_open("amda.db", &db);
@@ -722,15 +721,15 @@ double get_instrument_time(int instrument_id) {
     rc=sqlite3_step(res);
     if(rc==SQLITE_ROW) {
         ans = sqlite3_column_double(res, 0);
-        printf("Row found : %f\n", ans);
+        //printf("Row found : %f\n", ans);
     }
     else {
-        printf("No row found\n");
+        //printf("No row found\n");
     }
     sqlite3_finalize(res);
     sqlite3_close(db);
     free(q);
-    printf("before return :%f\n", ans);
+    //printf("before return :%f\n", ans);
     return ans;
 }
 int set_instrument_time(int instrument_id, double time) {
@@ -838,7 +837,7 @@ void Serv(int socket_id) {
          *----------------------------------------------*/
         err=request_call(&r, socket_id, &done_flag, &TicketID, &RemainID);
-    } while(done_flag== 0);/* end while(done_flag) */
+    } while(!done_flag);/* end while(done_flag) */
 endend:
@@ -257,11 +257,11 @@ int request_call_close_instrument(struct RequestData * request, int socket_id, i
 }
 int request_call_set_time(struct RequestData * request, DD_Var_t * ddvar, int socket_id) {
-    printf("\tinstrument id : %i\n", request->instrument_id);
-    printf("\tstart ddtime : %s\n", request->time);
+    //printf("\tinstrument id : %i\n", request->instrument_id);
+    //printf("\tstart ddtime : %s\n", request->time);
     double time_s;
     time_s = DD_Time2Double(request->time);
-    printf("\tstart double : %f\n", time_s);
+    //printf("\tstart double : %f\n", time_s);
     int err;
     if(request->instrument_id < 0) err = NOID;
     if(err >= 0) err = SetTime(ddvar,DD_Time2Double(request->time));
@@ -300,22 +300,26 @@ int request_call_data_info(struct RequestData * request, DD_Var_t * ddvar, int s
 int request_call_get_ticket(struct RequestData * request, int socket_id, int * done_flag, int * ticket_id) {
     int err;
+    printf("Checking ticket : login: %s, tick: %s\n", request->login, request->ticket);
     err= CheckTicket(request->login, request->ticket);
+    printf("err: %i\n", err);
     Put2Log(request->user_id,request->host,request->login,err); /* Log file */
+    printf("Getting ticket : user_id: %i, host: %s, err: %i\n", request->user_id, request->host, err);
     if(err>= 0) *ticket_id = GetTicket(request->user_id,request->host,err);
+    printf("\tticket id : %i\n", *ticket_id);
     PutHeader(*ticket_id,0,0,socket_id);
     *done_flag= 1;
     return err;
 }
 double get_instrument_time2(int instrument_id) {
-    printf("in get_instrument_time2 id : %i\n", instrument_id);
+    //printf("in get_instrument_time2 id : %i\n", instrument_id);
     // selection query
     char * q = malloc(1024 * sizeof(char));
     double ans = -1;
     int rc;
     sprintf(q, "SELECT start FROM instrument_time WHERE id=%i LIMIT 1;", instrument_id);
-    printf("query : -%s-\n", q);
+    //printf("query : -%s-\n", q);
     sqlite3 * db;
     sqlite3_stmt * res;
     sqlite3_open("amda.db", &db);
@@ -323,25 +327,25 @@ double get_instrument_time2(int instrument_id) {
     rc=sqlite3_step(res);
     if(rc==SQLITE_ROW) {
         ans = sqlite3_column_double(res, 0);
-        printf("Row found : %f\n", ans);
+        //printf("Row found : %f\n", ans);
     }
     else {
-        printf("No row found\n");
+        //printf("No row found\n");
     }
     sqlite3_finalize(res);
     sqlite3_close(db);
     free(q);
-    printf("before return :%f\n", ans);
+    //printf("before return :%f\n", ans);
     return ans;
 }
 int datatable_has_data2(char * table_name, double start, double stop) {
-    printf("in datatable_has_data2 : table_name:%s, start:%f, stop:%f\n", table_name, start, stop);
+    //printf("in datatable_has_data2 : table_name:%s, start:%f, stop:%f\n", table_name, start, stop);
     int ans = 0, rc;
     char * query = malloc( 1024 * sizeof(char) );
     memset(query, 0, 1024);
     sprintf(query, "SELECT count(Time) FROM %s WHERE Time>=%f AND Time<%f;", table_name, start, stop);
-    printf("\t\t has data query : %s\n", query);
+    //printf("\t\t has data query : %s\n", query);
     sqlite3 * db;
     sqlite3_stmt * res;
     sqlite3_open("amda.db", &db);
@@ -349,21 +353,21 @@ int datatable_has_data2(char * table_name, double start, double stop) {
     rc=sqlite3_step(res);
     if(rc==SQLITE_ROW) {
         ans = sqlite3_column_int(res, 0);
-        printf("row found :%i\n", ans);
+        //printf("row found :%i\n", ans);
     }
     else {
-        printf("no row found\n");
+        //printf("no row found\n");
     }
     sqlite3_finalize(res);
     sqlite3_close(db);
     free(query);
-    printf("before return : %i\n", ans);
+    //printf("before return : %i\n", ans);
     return ans;
 }
 int request_call_data_get(struct RequestData * request, int socket_id, int * done_flag, int * ticket_id) {
     int err,serr;
-    printf("\tparameters : ");
-    print_string_array(request->variable_names, request->variable_count);
+    //printf("\tparameters : ");
+    //print_string_array(request->variable_names, request->variable_count);
     // note the time at this point
     struct timespec t0, t1;
     clock_gettime(CLOCK_MONOTONIC_RAW, &t0);
@@ -386,15 +390,15 @@ int request_call_data_get(struct RequestData * request, int socket_id, int * don
          has_vi=has_virtual_instrument(table_name);
          if(has_vi) {
              // try to get data for this instrument between start and stop dates
-             printf("Instrument id : %i\n", request->instrument_id);
+             //printf("Instrument id : %i\n", request->instrument_id);
              double start_time; start_time = get_instrument_time(request->instrument_id);
-             printf("start_time %f\n", start_time);
-             printf("request time str : %s\n", request->time);
+             //printf("start_time %f\n", start_time);
+             //printf("request time str : %s\n", request->time);
              double stop_time; stop_time = start_time + DD_Time2Double(request->time);
-             printf("before datatable_has_data2 call : table_name:%s, start_time:%f, stop_time:%f\n", table_name, start_time,stop_time);
+             //printf("before datatable_has_data2 call : table_name:%s, start_time:%f, stop_time:%f\n", table_name, start_time,stop_time);
              int has_data;
              has_data = datatable_has_data(table_name, start_time, stop_time);
-             printf("in request_call_data_get : has_data : %i\n", has_data);
+             //printf("in request_call_data_get : has_data : %i\n", has_data);
              if(has_data || 1) {
                  err = get_data_from_table(table_name, request);
              }
@@ -416,8 +420,8 @@ int request_call_data_get(struct RequestData * request, int socket_id, int * don
     // note time at this point
     clock_gettime(CLOCK_MONOTONIC_RAW, &t1);
     uint64_t ns = (t1.tv_sec - t0.tv_sec) * 1000000 + (t1.tv_nsec - t0.tv_nsec) / 1000;
-    printf("\t\t\tREQUEST TIME :%" PRIu64 "\n", ns);
-    printf("\t\t\t\t %f ms\n", ns / 1000.); 
+    //printf("\t\t\tREQUEST TIME :%" PRIu64 "\n", ns);
+    //printf("\t\t\t\t %f ms\n", ns / 1000.); 
     // TODO - free DD_Var_t object
     //DD_Var[r.instrument_id] = NULL;
     return err;
@@ -438,6 +442,7 @@ int request_call(struct RequestData * request, int socket_id, int * done_flag, i
         case TIMESETREQ:
             printf("REQUEST : TIMESETREQ\n");
             err=request_call_set_time(request, DD_Var[request->instrument_id], socket_id);
+            printf("SetTime err : %i\n", err);
             set_instrument_time(request->instrument_id, DD_Time2Double(request->time));
             break;
         case DATAINFOREQ: