Changeset 4633
- Timestamp:
- 01/27/11 18:42:03 (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r4630 r4633 826 826 FTAB ftab; 827 827 CLASSTAB cltab; 828 828 char *init_history; 829 829 int init_history_pos; 830 830 int brk_pos; … … 1359 1359 extern void kill_thread(struct s_client *cl); 1360 1360 extern int get_threadnum(struct s_client *client); 1361 extern int get_ridx(struct s_reader *reader);1362 1361 extern void cs_add_violation(uint ip); 1363 1362 -
trunk/module-monitor.c
r4617 r4633 236 236 if (cl){ 237 237 char ldate[16], ltime[16], *usr; 238 int lsec, isec, con, cau, lrt ;238 int lsec, isec, con, cau, lrt =- 1; 239 239 time_t now; 240 240 struct tm lt; … … 264 264 if( cl->typ == 'r') 265 265 { 266 lrt = get_ridx(cl->reader); 267 if( lrt >= 0 ) 268 lrt = 10 + cl->reader->card_status; 266 int i; 267 struct s_reader *rdr; 268 for (i=0,rdr=first_active_reader; rdr ; rdr=rdr->next, i++) 269 if (cl->reader == rdr) 270 lrt=i; 271 272 if( lrt >= 0 ) 273 lrt = 10 + cl->reader->card_status; 269 274 } 270 275 else … … 386 391 387 392 if (cfg.saveinithistory) { 388 FILE *fp; 389 char filename[32]; 390 char buffer[128]; 391 sprintf(filename, "%s/reader%d", get_tmp_dir(), get_ridx(cl->reader)); 392 fp = fopen(filename, "r"); 393 394 if (fp) { 395 while(fgets(buffer, 128, fp) != NULL) { 396 monitor_send_details(buffer, (unsigned long)(cl->thread)); 393 if (cl->reader->init_history) { 394 char *ptr,*ptr1 = NULL; 395 for (ptr=strtok_r(cl->reader->init_history, "\n", &ptr1); ptr; ptr=strtok_r(NULL, "\n", &ptr1)) { 396 monitor_send_details(ptr, (unsigned long)(cl->thread)); 397 ptr[-1]='\n'; 397 398 } 398 fclose(fp);399 399 } 400 400 } else { -
trunk/oscam-http.c
r4628 r4633 833 833 834 834 char *send_oscam_reader_config(struct templatevars *vars, struct uriparams *params, struct in_addr in) { 835 int i , ridx=0;835 int i; 836 836 char *reader_ = getParam(params, "label"); 837 837 char *value; … … 892 892 893 893 rdr = get_reader_by_label(reader_); 894 ridx = get_ridx(rdr); //do we really need this index number, would like to get rid of get_ridx ...895 894 896 895 tpl_addVar(vars, TPLADD, "READERNAME", rdr->label); … … 1169 1168 default : 1170 1169 tpl_addVar(vars, TPLAPPEND, "MESSAGE", "<b>Error: protocol not resolvable</b><BR>"); 1171 tpl_printf(vars, TPLAPPEND, "MESSAGE", "<b>Error: protocol number: %d readername: %s readeridx: %d</b><BR>", rdr->typ, rdr->label, ridx);1170 tpl_printf(vars, TPLAPPEND, "MESSAGE", "<b>Error: protocol number: %d readername: %s</b><BR>", rdr->typ, rdr->label); 1172 1171 break; 1173 1172 … … 1904 1903 tpl_addVar(vars, TPLADD, "LOGHISTORY", "->"); 1905 1904 // normal non-cccam reader 1906 FILE *fp;1907 char filename[256];1908 char buffer[128];1909 1905 1910 1906 rdr = get_reader_by_label(reader_); 1911 int ridx = get_ridx(rdr); 1912 1913 snprintf(filename, sizeof(filename), "%s/reader%d", get_tmp_dir(), ridx); 1914 fp = fopen(filename, "r"); 1915 1916 if (fp) { 1917 while (fgets(buffer, sizeof(buffer), fp) != NULL) { 1918 tpl_printf(vars, TPLAPPEND, "LOGHISTORY", "%s<BR>\n", buffer); 1907 1908 if (rdr->init_history) { 1909 char *ptr, *ptr1 = NULL; 1910 for (ptr=strtok_r(rdr->init_history, "\n", &ptr1); ptr; ptr=strtok_r(NULL, "\n", &ptr1)) { 1911 tpl_printf(vars, TPLAPPEND, "LOGHISTORY", "%s<BR />", ptr); 1912 ptr[-1]='\n'; 1919 1913 } 1920 fclose(fp);1921 } 1914 } 1915 1922 1916 tpl_addVar(vars, TPLADD, "READERNAME", rdr->label); 1923 1917 tpl_addVar(vars, TPLADD, "ENTITLEMENTCONTENT", tpl_getTpl(vars, "ENTITLEMENTGENERICBIT")); -
trunk/oscam-reader.c
r4624 r4633 19 19 va_list params; 20 20 va_start(params, fmt); 21 vs printf(txt, fmt, params);21 vsnprintf(txt, sizeof(txt)-1, fmt, params); 22 22 va_end(params); 23 23 cs_log("%s", txt); 24 24 25 25 if (cfg.saveinithistory) { 26 FILE *fp; 27 char filename[256]; 28 char *buffer; 29 int filelen = 0; 30 sprintf(filename, "%s/reader%d", get_tmp_dir(), get_ridx(reader)); 31 int size = reader->init_history_pos+strlen(txt)+1; 32 buffer = malloc(size+1); 33 34 if (buffer == NULL) 26 int size = reader->init_history_pos+strlen(txt)+2; 27 28 cs_realloc(&reader->init_history, size, -1); 29 30 if (!reader->init_history) 35 31 return; 36 32 37 memset(buffer, 32, size); 38 39 fp = fopen(filename, "r"); 40 41 if (fp) { 42 filelen = fread(buffer, 1, reader->init_history_pos, fp); 43 fclose(fp); 44 } 45 46 sprintf(buffer + filelen, "%s\n", txt); 47 48 fp = fopen(filename, "w"); 49 if (fp) { 50 fwrite(buffer, 1, filelen + strlen(txt)+1, fp); 51 fclose(fp); 52 } 53 54 free(buffer); 55 } 56 reader->init_history_pos+=strlen(txt)+1; 33 memcpy(reader->init_history+reader->init_history_pos, txt, strlen(txt)); 34 35 reader->init_history[size-2]='\n'; 36 reader->init_history[size-1]='\0'; 37 reader->init_history_pos+=strlen(txt)+1; 38 } 57 39 } 58 40 -
trunk/oscam.c
r4630 r4633 53 53 char loghist[CS_MAXLOGHIST*CS_LOGHISTSIZE]; // ptr of log-history 54 54 #endif 55 56 int get_ridx(struct s_reader *reader) {57 int i;58 struct s_reader *rdr;59 for (i=0,rdr=first_active_reader; rdr ; rdr=rdr->next, i++)60 if (reader == rdr)61 return i;62 return -1;63 }64 55 65 56 int get_threadnum(struct s_client *client) {
Note:
See TracChangeset
for help on using the changeset viewer.