Changeset 4979
- Timestamp:
- 04/12/11 01:29:06 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r4978 r4979 1503 1503 extern char *mk_t_service( uint64 sidtabok, uint64 sidtabno); 1504 1504 extern char *mk_t_logfile(); 1505 extern char *mk_t_iprange(struct s_ip *range); 1505 1506 1506 1507 //Todo #ifdef CCCAM -
trunk/oscam-config.c
r4977 r4979 1731 1731 FILE *f; 1732 1732 char *value; 1733 char *dot = ""; //flag for delimiter1734 1733 char tmpfile[256]; 1735 1734 char destfile[256]; … … 1866 1865 fprintf_conf(f, CONFVARWIDTH, "port", "%d\n", cfg.mon_port); 1867 1866 if (cfg.mon_srvip != 0) 1868 fprintf_conf(f, CONFVARWIDTH, "serverip", "%s\n", cs_inet_ntoa(cfg.mon_srvip)); 1869 1870 fprintf_conf(f, CONFVARWIDTH, "nocrypt", ""); 1871 struct s_ip *cip; 1872 for (cip = cfg.mon_allowed; cip; cip = cip->next){ 1873 fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0])); 1874 if (cip->ip[0] != cip->ip[1]) fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1])); 1875 dot=","; 1876 } 1877 fputc((int)'\n', f); 1867 fprintf_conf(f, CONFVARWIDTH, "serverip", "%s\n", cs_inet_ntoa(cfg.mon_srvip)); 1868 value = mk_t_iprange(cfg.mon_allowed); 1869 if(strlen(value) > 0 || cfg.http_full_cfg) 1870 fprintf_conf(f, CONFVARWIDTH, "nocrypt", "%s\n", value); 1871 free(value); 1878 1872 if(cfg.mon_aulow != 30 || cfg.http_full_cfg) 1879 1873 fprintf_conf(f, CONFVARWIDTH, "aulow", "%d\n", cfg.mon_aulow); … … 1900 1894 fprintf_conf(f, CONFVARWIDTH, "key", ""); 1901 1895 for (i = 0; i < 14; i++) fprintf(f,"%02X", cfg.ncd_key[i]); 1902 fprintf(f,"\n"); 1903 fprintf_conf(f, CONFVARWIDTH, "allowed", ""); 1904 struct s_ip *cip; 1905 dot=""; 1906 for (cip = cfg.ncd_allowed; cip; cip = cip->next){ 1907 fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0])); 1908 if (cip->ip[0] != cip->ip[1]) fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1])); 1909 dot=","; 1910 } 1911 fprintf(f,"\n"); 1896 fprintf(f,"\n"); 1897 value = mk_t_iprange(cfg.ncd_allowed); 1898 if(strlen(value) > 0 || cfg.http_full_cfg) 1899 fprintf_conf(f, CONFVARWIDTH, "allowed", "%s\n", value); 1900 free(value); 1912 1901 if(cfg.ncd_keepalive != 1 || cfg.http_full_cfg) 1913 1902 fprintf_conf(f, CONFVARWIDTH, "keepalive", "%d\n", cfg.ncd_keepalive); … … 1926 1915 fprintf_conf(f, CONFVARWIDTH, "passive", "%d\n", cfg.c33_passive); 1927 1916 fprintf_conf(f, CONFVARWIDTH, "key", ""); for (i = 0; i < (int) sizeof(cfg.c33_key); ++i) fprintf(f,"%02X", cfg.c33_key[i]); fputc((int)'\n', f); 1928 fprintf_conf(f, CONFVARWIDTH, "nocrypt", ""); 1929 struct s_ip *cip; 1930 dot=""; 1931 for (cip = cfg.c33_plain; cip; cip = cip->next){ 1932 fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0])); 1933 if (cip->ip[0] != cip->ip[1]) fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1])); 1934 dot=","; 1935 } 1936 fprintf(f,"\n\n"); 1917 value = mk_t_iprange(cfg.c33_plain); 1918 if(strlen(value) > 0 || cfg.http_full_cfg) 1919 fprintf_conf(f, CONFVARWIDTH, "nocrypt", "%s\n", value); 1920 free(value); 1921 fprintf(f,"\n"); 1937 1922 } 1938 1923 … … 1970 1955 fprintf_conf(f, CONFVARWIDTH, "serverip", "%s\n", cs_inet_ntoa(cfg.rad_srvip)); 1971 1956 fprintf_conf(f, CONFVARWIDTH, "user", "%s\n", cfg.rad_usr); 1972 fprintf_conf(f, CONFVARWIDTH, "allowed", ""); 1973 struct s_ip *cip; 1974 dot=""; 1975 for (cip = cfg.rad_allowed; cip; cip = cip->next){ 1976 fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0])); 1977 if (cip->ip[0] != cip->ip[1]) 1978 fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1])); 1979 dot=","; 1980 } 1981 fprintf(f,"\n\n"); 1957 value = mk_t_iprange(cfg.rad_allowed); 1958 if(strlen(value) > 0 || cfg.http_full_cfg) 1959 fprintf_conf(f, CONFVARWIDTH, "allowed", "%s\n", value); 1960 free(value); 1961 fprintf(f,"\n"); 1982 1962 } 1983 1963 … … 2078 2058 if(cfg.http_refresh > 0 || cfg.http_full_cfg) 2079 2059 fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg.http_refresh); 2080 fprintf_conf(f, CONFVARWIDTH, "httpallowed", ""); 2081 struct s_ip *cip; 2082 dot = ""; 2083 for (cip = cfg.http_allowed; cip; cip = cip->next){ 2084 fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0])); 2085 if (cip->ip[0] != cip->ip[1]) fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1])); 2086 dot = ","; 2087 } 2088 fputc((int)'\n', f); 2060 value = mk_t_iprange(cfg.http_allowed); 2061 if(strlen(value) > 0 || cfg.http_full_cfg) 2062 fprintf_conf(f, CONFVARWIDTH, "httpallowed", "%s\n", value); 2063 free(value); 2089 2064 if(strlen((const char *) (cfg.http_dyndns)) > 0 || cfg.http_full_cfg) 2090 2065 fprintf_conf(f, CONFVARWIDTH, "httpdyndns", "%s\n", cfg.http_dyndns); … … 4538 4513 return value; 4539 4514 } 4515 4516 char *mk_t_iprange(struct s_ip *range){ 4517 struct s_ip *cip; 4518 char *value, *tmp, *dot = ""; 4519 int needed = 1, pos = 0; 4520 for (cip = range; cip; cip = cip->next) needed += 32; 4521 4522 if(!cs_malloc(&tmp, needed * sizeof(char), -1)) return ""; 4523 4524 for (cip = range; cip; cip = cip->next){ 4525 pos += snprintf(tmp + pos, needed - pos, "%s%s", dot, cs_inet_ntoa(cip->ip[0])); 4526 if (cip->ip[0] != cip->ip[1]) pos += snprintf(tmp + pos, needed - pos, "-%s", cs_inet_ntoa(cip->ip[1])); 4527 dot=","; 4528 } 4529 if(!cs_malloc(&value, (pos + 1) * sizeof(char), -1)) return ""; 4530 memcpy(value, tmp, pos + 1); 4531 return value; 4532 } -
trunk/oscam-http.c
r4978 r4979 264 264 265 265 for (i = 0; i < (int) sizeof(cfg.c33_key); ++i) tpl_printf(vars, TPLAPPEND, "KEY", "%02X",cfg.c33_key[i]); 266 struct s_ip *cip; 267 char *dot=""; 268 for (cip = cfg.c33_plain; cip; cip = cip->next) { 269 tpl_printf(vars, TPLAPPEND, "NOCRYPT", "%s%s", dot, cs_inet_ntoa(cip->ip[0])); 270 if (cip->ip[0] != cip->ip[1]) tpl_printf(vars, TPLAPPEND, "NOCRYPT", "-%s", cs_inet_ntoa(cip->ip[1])); 271 dot=","; 272 } 266 char *value = mk_t_iprange(cfg.c33_plain); 267 tpl_addVar(vars, TPLADD, "NOCRYPT", value); 268 free(value); 273 269 } 274 270 … … 364 360 for (i = 0; i < 14; i++) tpl_printf(vars, TPLAPPEND, "KEY", "%02X", cfg.ncd_key[i]); 365 361 366 struct s_ip *cip; 367 char *dot = ""; 368 for (cip = cfg.ncd_allowed; cip; cip = cip->next) { 369 tpl_printf(vars, TPLAPPEND, "ALLOWED", "%s%s", dot, cs_inet_ntoa(cip->ip[0])); 370 if (cip->ip[0] != cip->ip[1]) tpl_printf(vars, TPLAPPEND, "ALLOWED", "-%s", cs_inet_ntoa(cip->ip[1])); 371 dot=","; 372 } 362 value = mk_t_iprange(cfg.ncd_allowed); 363 tpl_addVar(vars, TPLADD, "ALLOWED", value); 364 free(value); 373 365 374 366 if (cfg.ncd_keepalive) … … 402 394 tpl_addVar(vars, TPLADD, "USER", cfg.rad_usr); 403 395 404 struct s_ip *cip; 405 char *dot=""; 406 for (cip=cfg.rad_allowed; cip; cip=cip->next) { 407 tpl_printf(vars, TPLAPPEND, "ALLOWED", "%s%s", dot, cs_inet_ntoa(cip->ip[0])); 408 if (cip->ip[0] != cip->ip[1]) 409 tpl_printf(vars, TPLAPPEND, "ALLOWED", "-%s", cs_inet_ntoa(cip->ip[1])); 410 dot=","; 411 } 396 char *value = mk_t_iprange(cfg.rad_allowed); 397 tpl_addVar(vars, TPLADD, "ALLOWED", value); 398 free(value); 412 399 413 400 return tpl_getTpl(vars, "CONFIGRADEGAST"); … … 557 544 if (cfg.http_hide_idle_clients > 0) tpl_addVar(vars, TPLADD, "CHECKED", "checked"); 558 545 559 struct s_ip *cip; 560 char *dot=""; 561 for (cip = cfg.mon_allowed; cip; cip = cip->next) { 562 tpl_printf(vars, TPLAPPEND, "NOCRYPT", "%s%s", dot, cs_inet_ntoa(cip->ip[0])); 563 if (cip->ip[0] != cip->ip[1]) tpl_printf(vars, TPLAPPEND, "NOCRYPT", "-%s", cs_inet_ntoa(cip->ip[1])); 564 dot=","; 565 } 566 567 dot=""; 568 for (cip = cfg.http_allowed; cip; cip = cip->next) { 569 tpl_printf(vars, TPLAPPEND, "HTTPALLOW", "%s%s", dot, cs_inet_ntoa(cip->ip[0])); 570 if (cip->ip[0] != cip->ip[1]) tpl_printf(vars, TPLAPPEND, "HTTPALLOW", "-%s", cs_inet_ntoa(cip->ip[1])); 571 dot=","; 572 } 546 char *value = mk_t_iprange(cfg.mon_allowed); 547 tpl_addVar(vars, TPLADD, "NOCRYPT", value); 548 free(value); 549 550 value = mk_t_iprange(cfg.http_allowed); 551 tpl_addVar(vars, TPLADD, "HTTPALLOW", value); 552 free(value); 573 553 574 554 tpl_printf(vars, TPLADD, "HTTPDYNDNS", "%s", cfg.http_dyndns);
Note:
See TracChangeset
for help on using the changeset viewer.