Changeset 1176
- Timestamp:
- 01/10/10 22:22:16 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/globals.h
r1172 r1176 800 800 extern char *mk_t_tuntab(TUNTAB *ttab); 801 801 extern char *mk_t_group(ulong *grp); 802 extern char *mk_t_ftab(FTAB *ftab); 802 803 803 804 // oscam-reader -
branches/monitor-improvement/oscam-config.c
r1175 r1176 1184 1184 free(value); 1185 1185 1186 //betatunnel 1186 1187 value = mk_t_tuntab(&account->ttab); 1187 1188 fprintf_conf(f, CONFVARWIDTH, "betatunnel", "%s\n", value); 1188 1189 free(value); 1189 1190 1190 fprintf_conf(f, CONFVARWIDTH, "ident", ""); 1191 int j; 1192 dot=""; 1193 FTAB *ftab = &account->ftab; 1194 for (i=0;i<ftab->nfilts;i++){ 1195 fprintf(f, "%s%04X", dot, ftab->filts[i].caid); 1196 dot=":"; 1197 for (j=0;j<ftab->filts[i].nprids;j++){ 1198 fprintf(f, "%s%06lX", dot, ftab->filts[i].prids[j]); 1199 dot=","; 1200 } 1201 dot=";"; 1202 } 1203 fputc((int)'\n', f); 1191 //ident 1192 value = mk_t_ftab(&account->ftab); 1193 fprintf_conf(f, CONFVARWIDTH, "ident", "%s\n", value); 1194 free(value); 1204 1195 1205 1196 #ifdef CS_ANTICASC … … 2006 1997 return value; 2007 1998 } 1999 2000 char *mk_t_ftab(FTAB *ftab){ 2001 int i = 0, j = 0, needed = 1, pos = 0; 2002 2003 needed = ftab->nfilts * 5; 2004 for (i = 0; i < ftab->nfilts; ++i) 2005 needed += ftab->filts[i].nprids * 7; 2006 2007 char *value = (char *) malloc(needed * sizeof(char)); 2008 2009 char *dot=""; 2010 for (i = 0; i < ftab->nfilts; ++i){ 2011 sprintf(value + pos, "%s%04X", dot, ftab->filts[i].caid); 2012 pos += 4; 2013 if (i > 0) pos += 1; 2014 dot=":"; 2015 for (j = 0; j < ftab->filts[i].nprids; ++j) { 2016 sprintf(value + pos, "%s%06lX", dot, ftab->filts[i].prids[j]); 2017 pos += 7; 2018 dot=","; 2019 } 2020 dot=";"; 2021 } 2022 2023 value[pos] = '\0'; 2024 return value; 2025 } -
branches/monitor-improvement/oscam-http.c
r1175 r1176 540 540 free(value); 541 541 542 /*IDENT*/ 543 int j; 544 char *dot=""; 545 FTAB *ftab = &reader[ridx].ftab; 546 for (i = 0; i < ftab->nfilts; ++i){ 547 tpl_printf(vars, 1, "IDENTS", "%s%04X", dot, ftab->filts[i].caid); 548 dot=":"; 549 for (j = 0; j < ftab->filts[i].nprids; ++j) { 550 tpl_printf(vars, 1, "IDENTS", "%s%06lX", dot, ftab->filts[i].prids[j]); 551 dot=","; 552 } 553 dot=";"; 554 } 542 //ident 543 value = mk_t_ftab(&reader[ridx].ftab); 544 tpl_printf(vars, 0, "IDENTS", "%s\n", value); 545 free(value); 555 546 556 547 //class 557 548 CLASSTAB *clstab = &reader[ridx].cltab; 558 dot="";549 char *dot=""; 559 550 for(i = 0; i < clstab->an; ++i){ 560 551 tpl_printf(vars, 1, "CLASS", "%s%02x", dot, (int)clstab->aclass[i]); … … 567 558 568 559 //chid 560 int j; 569 561 dot=""; 570 ftab = &reader[ridx].fchid;562 FTAB *ftab = &reader[ridx].fchid; 571 563 for (i = 0; i < ftab->nfilts; ++i){ 572 564 tpl_printf(vars, 1, "CHIDS", "%s%04X", dot, ftab->filts[i].caid); … … 676 668 user[sizeof(user)/sizeof(char) - 1] = '\0'; 677 669 678 int i , j;670 int i; 679 671 680 672 for (account = cfg->account; account != NULL && strcmp(user, account->usr) != 0; account = account->next); … … 803 795 free(value); 804 796 805 /*IDENT*/ 806 char *dot=""; 807 FTAB *ftab = &account->ftab; 808 for (i = 0; i < ftab->nfilts; ++i){ 809 tpl_printf(vars, 1, "IDENTS", "%s%04X", dot, ftab->filts[i].caid); 810 dot=":"; 811 for (j = 0; j < ftab->filts[i].nprids; ++j) { 812 tpl_printf(vars, 1, "IDENTS", "%s%06lX", dot, ftab->filts[i].prids[j]); 813 dot=","; 814 } 815 dot=";"; 816 } 797 //ident 798 value = mk_t_ftab(&account->ftab); 799 tpl_printf(vars, 0, "IDENTS", "%s\n", value); 800 free(value); 817 801 818 802 //Betatunnel
Note:
See TracChangeset
for help on using the changeset viewer.