- Timestamp:
- 06/07/11 00:44:09 (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r5362 r5365 1 #define _GNU_SOURCE // prevents "implicit" warning for asprintf1 #define _GNU_SOURCE //needed for PTHREAD_MUTEX_RECURSIVE on some plattforms and maybe other things; do not remove 2 2 #include <stdlib.h> 3 3 #include <stdio.h> -
trunk/module-cccam.c
r5352 r5365 2608 2608 int32_t wakeup = 0; 2609 2609 struct s_reader *rdr; 2610 struct s_client *client; 2611 struct cc_data *cc; 2610 2612 for (rdr = first_active_reader; rdr; rdr = rdr->next) { 2611 2613 if (rdr->typ != R_CCCAM) … … 2616 2618 continue; 2617 2619 if (rdr->cc_keepalive) //if reader has keepalive but is NOT connected, reader can't connect. so don't ask him 2620 continue; 2621 if((client = rdr->client) == NULL || (cc = client->cc) == NULL || cc->mode == CCCAM_MODE_SHUTDOWN) //reader is in shutdown 2622 continue; 2623 if(is_connect_blocked(rdr)) //reader cannot be waked up currently because its blocked 2618 2624 continue; 2619 2625 … … 2939 2945 if (!cl->udp_fd) { 2940 2946 cc_cli_init_int(cl); 2941 return -1; // cc_cli_init_int 32_tcalls cc_cli_connect, so exit here!2947 return -1; // cc_cli_init_int calls cc_cli_connect, so exit here! 2942 2948 } 2943 2949 -
trunk/module-lcd.c
r5362 r5365 13 13 #include <sys/stat.h> 14 14 #include <dirent.h> 15 #include "global-functions.h"16 15 17 16 #ifdef MODULE_CCCAM -
trunk/oscam-config.c
r5355 r5365 1765 1765 account->autoau = 0; 1766 1766 1767 if (!account->aureader_list) 1768 account->aureader_list = ll_create(); 1769 1770 if(value && value[0] == '1') { 1771 account->autoau = 1; 1772 } 1773 ll_clear(account->aureader_list); 1774 1767 1775 // exit if invalid or no value 1768 1776 if ((strlen(value) == 0) || (value[0] == '0')) 1769 1777 return; 1770 1778 1779 LL_ITER itr = ll_iter_create(configured_readers); 1771 1780 struct s_reader *rdr; 1772 1781 char *pch; 1773 if (!account->aureader_list)1774 account->aureader_list = ll_create();1775 1776 if(value && value[0] == '1') {1777 account->autoau = 1;1778 }1779 LL_ITER itr = ll_iter_create(configured_readers);1780 ll_clear(account->aureader_list);1781 1782 1782 1783 for (pch = strtok_r(value, ",", &saveptr1); pch != NULL; pch = strtok_r(NULL, ",", &saveptr1)) {
Note:
See TracChangeset
for help on using the changeset viewer.