Changeset 8202
- Timestamp:
- 01/27/13 13:09:15 (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam-config-global.c
r8201 r8202 504 504 #endif 505 505 506 void newcamd_key_fn(const char *token, char *value, void *setting, FILE *f) { 507 #define ncd_key_len 16 /* sizeof(ncd_key) */ 508 #define ncd_key_size 14 /* How much bytes the key have */ 509 uint8_t *ncd_key = setting; 510 if (value) { 511 if (strlen(value) == 0) { 512 memset(ncd_key, 0, ncd_key_len); 513 } else if (key_atob_l(value, ncd_key, ncd_key_size * 2)) { 514 fprintf(stderr, "ERROR: Can't parse config setting %s=%s\n", token, value); 515 memset(ncd_key, 0, ncd_key_len); 516 } 517 return; 518 } 519 int32_t ok = check_filled(ncd_key, ncd_key_size); 520 if (ok || cfg.http_full_cfg) { 521 fprintf_conf(f, token, "%s", ""); // it should not have \n at the end 522 if (ok) { 523 for (ok = 0; ok < ncd_key_size; ok++) { 524 fprintf(f, "%02X", ncd_key[ok]); 525 } 526 } 527 fprintf(f, "\n"); 528 } 529 } 530 506 531 #ifdef MODULE_NEWCAMD 507 static void newcamd_key_fn(const char *token, char *value, void *UNUSED(setting), FILE *f) {508 if (value) {509 if (strlen(value) == 0) {510 memset(cfg.ncd_key, 0, sizeof(cfg.ncd_key));511 } else if (key_atob_l(value, cfg.ncd_key, 28)) {512 fprintf(stderr, "Configuration newcamd: Error in Key\n");513 memset(cfg.ncd_key, 0, sizeof(cfg.ncd_key));514 }515 return;516 }517 fprintf_conf(f, token, "%s", ""); // it should not have \n at the end518 unsigned int i;519 for (i = 0; i < 14; i++) {520 fprintf(f,"%02X", cfg.ncd_key[i]);521 }522 fprintf(f,"\n");523 }524 525 532 static bool newcamd_should_save_fn(void *UNUSED(var)) { return cfg.ncd_ptab.nports && cfg.ncd_ptab.ports[0].s_port; } 526 533 -
trunk/oscam-config-reader.c
r8200 r8202 459 459 } 460 460 461 static void key_fn(const char *token, char *value, void *setting, FILE *f) {462 struct s_reader *rdr = setting;463 if (value) {464 memset(rdr->ncd_key, 0, sizeof(rdr->ncd_key));465 if (strlen(value) == 0)466 return;467 if (key_atob_l(value, rdr->ncd_key, 28)) {468 fprintf(stderr, "reader key parse error, %s=%s\n", token, value);469 memset(rdr->ncd_key, 0, sizeof(rdr->ncd_key));470 }471 return;472 }473 if (rdr->ncd_key[0] || rdr->ncd_key[13] || cfg.http_full_cfg) {474 fprintf_conf(f, token, "%s", ""); // it should not have \n at the end475 if (rdr->ncd_key[0] || rdr->ncd_key[13]) {476 int j;477 for (j = 0; j < 14; j++) {478 fprintf(f, "%02X", rdr->ncd_key[j]);479 }480 }481 fprintf(f, "\n");482 }483 }484 485 461 static void services_fn(const char *token, char *value, void *setting, FILE *f) { 486 462 struct s_reader *rdr = setting; … … 944 920 DEF_OPT_FUNC("protocol" , 0, protocol_fn ), 945 921 DEF_OPT_FUNC("device" , 0, device_fn ), 946 DEF_OPT_FUNC("key" , 0,key_fn ),922 DEF_OPT_FUNC("key" , OFS(ncd_key), newcamd_key_fn ), 947 923 DEF_OPT_SSTR("user" , OFS(r_usr), "", SIZEOF(r_usr) ), 948 924 DEF_OPT_SSTR("password" , OFS(r_pwd), "", SIZEOF(r_pwd) ), -
trunk/oscam-config.h
r8200 r8202 34 34 void cspvaluetab_fn(const char *token, char *value, void *setting, FILE *f); 35 35 void hitvaluetab_fn(const char *token, char *value, void *setting, FILE *f); 36 void newcamd_key_fn(const char *token, char *value, void *setting, FILE *f); 36 37 37 38 #endif
Note:
See TracChangeset
for help on using the changeset viewer.