Changeset 1387
- Timestamp:
- 01/31/10 16:12:37 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/globals.h
r1386 r1387 369 369 struct s_reader 370 370 { 371 int pid; 371 372 int cs_idx; 372 373 int fd; -
branches/monitor-improvement/oscam-http.c
r1383 r1387 447 447 448 448 void send_oscam_reader(struct templatevars *vars, FILE *f, struct uriparams *params, struct in_addr in) { 449 450 if (strcmp(getParam(params, "action"), "reread") == 0){451 refresh_oscam(REFR_READERS, in);452 }453 454 449 int ridx; 455 450 char *ctyp; 456 457 for(ridx=0;ridx<CS_MAXREADER;ridx++){ 451 //uchar dummy[1]={0x00}; 452 453 if (strcmp(getParam(params, "action"), "reread") == 0){ 454 //ridx = atoi(getParam(params, "ridx")); 455 //write_to_pipe(client[ridx].fd_m2c, PIP_ID_CIN, dummy, 1); 456 refresh_oscam(REFR_READERS, in); 457 } 458 459 for(ridx = 0; ridx < CS_MAXREADER; ridx++){ 460 461 tpl_addVar(vars, 0, "REFRESH",""); 462 tpl_printf(vars, 0, "RIDX", ""); 463 458 464 if(!reader[ridx].device[0]) break; 459 465 switch(reader[ridx].typ){ 460 case R_MOUSE : ctyp="mouse"; break; 466 case R_MOUSE : ctyp="mouse"; 467 tpl_printf(vars, 0, "RIDX", "%d", 0); //todo find a solution to adress the client 468 tpl_addVar(vars, 0, "REFRICO", ICREF); 469 tpl_addVar(vars, 0, "REFRESH", tpl_getTpl(vars, "READERREFRESHBIT")); 470 break; 461 471 case R_INTERNAL: ctyp="intern"; break; 462 case R_SMART : ctyp="smartreader"; break; 472 case R_SMART : ctyp="smartreader"; 473 tpl_printf(vars, 0, "RIDX", "%d", 0); //todo find a solution to adress the client 474 tpl_addVar(vars, 0, "REFRICO", ICREF); 475 tpl_addVar(vars, 0, "REFRESH", tpl_getTpl(vars, "READERREFRESHBIT")); 476 break; 463 477 case R_CAMD35 : ctyp="camd 3.5x";break; 464 478 case R_CAMD33 : ctyp="camd 3.3x";break; 465 479 case R_NEWCAMD : ctyp="newcamd"; break; 466 480 case R_RADEGAST: ctyp="radegast"; break; 467 case R_SERIAL : ctyp="serial"; break; 481 case R_SERIAL : ctyp="serial"; 482 tpl_printf(vars, 0, "RIDX", "%d", 0); //todo find a solution to adress the client 483 tpl_addVar(vars, 0, "REFRICO", ICREF); 484 tpl_addVar(vars, 0, "REFRESH", tpl_getTpl(vars, "READERREFRESHBIT")); 485 break; 468 486 #ifdef CS_WITH_GBOX 469 487 case R_GBOX : ctyp="gbox"; break; -
branches/monitor-improvement/oscam-http.h
r1385 r1387 120 120 vTtJQrT0rEb/ebukDQEGABzNvVc4pYJ1AAAAAElFTkSuQmCC" 121 121 122 #define ICREF "data:image/png;base64,\ 123 iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAYAAAAmlE46AAAABHNCSVQICAgIfAhkiAAAABl0RVh0\ 124 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAALFSURBVCiRZZFLaFx1FMZ/59x7M5OZSWJq\ 125 88DYpAabBkGNLVLrKIIbxQe0+MBaZQoFERG3VtRlF0UqghHBjXONZCGCUgQRIUWdSZVWSzfWpq+Y\ 126 ttZMm0yaTud15/6Piwwo9Vsevt/3wXfEzAAohnKHet5+4BEXx/2quiLKybjlJoGvsjmL2j4BDoqZ\ 127 UQxlh6pOD24cCnoHBv1EaoSWy1CvXKN04ffKtdJcZM72ZHN2aHZKPjTjRSnkGVPP+3Xz1nsyyXRA\ 128 HCUJ0qOIP4z4tyPaQ7N2lZM/vlNt1sonEumBrY3qYk1mP9MP+jYMvR4Enl6evyAudiB+nFm3sXrb\ 129 2OOZnsHHRLxekDR/zx2wW4d3y/FvnlqR2Slv0Q/8/qgZmTlXB94CpoAJ9eT9noFtm+584GDKC7pA\ 130 u3DxKke/vLesZnZLqxk5c+5bYBn4Ppuz5WzOZra/5CbKf/389rGvH7W4VaNV/QnWxjQ1M3XOzQGn\ 131 AAd4tFUMJa0qr449uM/5iQ34yfsAATAp5EkD1Wyu/Zd/IQUOAU8GnX1NETVEDSCqXl6RQsgSxjr+\ 132 r++A3UB8010AzxcItr3wB6JpwHH17Hvu7NHJc87xXDZn129OK4ayGZjx1xKUVu0IzqU4/cukAvv/\ 133 CxVDuQv4YtMEz3QkeTdqSJ+ulXv4qYfoyGxh4olpUt2DHx35XH8ohnJ3m90VJGgsLjDZinSXerok\ 134 xZDK/c8eSy8v5G396Bsi2oWLFlg6/7FdOjVTq19f6BBVHzA/8EVEXKPW2CfFkBvd/Vt0tfTbuc7u\ 135 oZHxhw+kg84RLJrHtc4T18/QuDFPVLuEiM+ZE6fLzrlxKeSpqDK9/WV7pRjK86J80r1+1OsfHs8k\ 136 Mz14skq98iflxVJUunilac6ezubssBTyfArszebMtYdIADs9X18zs3EXW696egU47GL3ZjZnFwH+\ 137 AYRRPIe3vIMRAAAAAElFTkSuQmCC" 138 122 139 #define TPLHEADER "\ 123 140 <HTML>\n\ … … 408 425 ##TPLMENU##\n\ 409 426 <BR><BR>\n\ 410 <TABLE CLASS=\"configmenu\"><TR><TD CLASS=\"configmenu\"><A HREF=\"readers.html?action=reread\">Refresh Tiers</A></TD></TR></TABLE><BR>\411 427 <TABLE cellspacing=\"0\" cellpadding=\"10\">\n\ 412 428 <TR>\n\ 413 429 <TH>Reader</TH>\n\ 414 430 <TH>Protocol</TH>\n\ 415 <TH COLSPAN=\" 2\">Action</TH>\n\431 <TH COLSPAN=\"3\">Action</TH>\n\ 416 432 </TR>\n\ 417 433 ##READERLIST##\ … … 425 441 <TD><A HREF=\"readerconfig.html?reader=##READERNAMEENC##\" TITLE=\"Edit this Reader\"><IMG SRC=\"##EDIICO##\" BORDER=\"0\" ALT=\"Edit Reader\"/></A></TD>\ 426 442 <TD><A HREF=\"entitlements.html?reader=##READERNAME##\" TITLE=\"Show Entitlement\"><IMG SRC=\"##ENTICO##\" BORDER=\"0\" ALT=\"Show Entitlement\"/></A></TD>\n\ 443 <TD>##REFRESH##</TD>\n\ 427 444 </TR>\n" 445 446 #define TPLREADERREFRESHBIT "<A HREF=\"readers.html?action=reread&ridx=##RIDX##\" TITLE=\"Refresh Entitlement\"><IMG SRC=\"##REFRICO##\" BORDER=\"0\" ALT=\"Refresh Entitlement\"/></A>" 428 447 429 448 #define TPLENTITLEMENTS "\ … … 980 999 "READERS", 981 1000 "READERSBIT", 1001 "READERREFRESHBIT", 982 1002 "ENTITLEMENTS", 983 1003 "READERCONFIG", … … 1047 1067 TPLREADERS, 1048 1068 TPLREADERSBIT, 1069 TPLREADERREFRESHBIT, 1049 1070 TPLENTITLEMENTS, 1050 1071 TPLREADERCONFIG, -
branches/monitor-improvement/oscam.c
r1378 r1387 532 532 reader[ridx].fd=client[i].fd_m2c; 533 533 reader[ridx].cs_idx=i; 534 reader[ridx].pid=pid; 534 535 if (reader[ridx].r_port) 535 536 cs_log("proxy started (pid=%d, server=%s)",
Note:
See TracChangeset
for help on using the changeset viewer.