Changeset 1839 for branches/modular/oscam.c
- Timestamp:
- 03/17/10 00:29:38 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/modular/oscam.c
r1832 r1839 902 902 static void cs_client_resolve() 903 903 { 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 904 while (1) 905 { 906 struct hostent *rht; 907 struct s_auth *account; 908 struct sockaddr_in udp_sa; 909 910 for (account=cfg->account; account; account=account->next) 911 if (account->dyndns[0]) 912 { 913 rht=gethostbyname((const char *)account->dyndns); 914 if (rht) 915 { 916 memcpy(&udp_sa.sin_addr, rht->h_addr, sizeof(udp_sa.sin_addr)); 917 account->dynip=cs_inet_order(udp_sa.sin_addr.s_addr); 918 } 919 else 920 cs_log("can't resolve hostname %s (user: %s)", account->dyndns, account->usr); 921 client[cs_idx].last=time((time_t)0); 922 } 923 sleep(cfg->resolvedelay); 924 } 925 925 } 926 926 927 927 static void start_client_resolver() 928 928 { 929 930 931 932 933 934 935 936 937 938 939 929 int i; 930 pthread_t tid; 931 932 i=pthread_create(&tid, (pthread_attr_t *)0, (void *)&cs_client_resolve, (void *) 0); 933 if (i) 934 cs_log("ERROR: can't create resolver-thread (err=%d)", i); 935 else 936 { 937 cs_log("resolver thread started"); 938 pthread_detach(tid); 939 } 940 940 } 941 941 942 942 void cs_resolve() 943 943 { 944 945 946 947 948 949 950 951 rht=gethostbyname(reader[i].device);952 953 954 955 956 957 958 959 960 961 944 int i, idx; 945 struct hostent *rht; 946 struct s_auth; 947 for (i=0; i<CS_MAXREADER; i++) 948 if ((idx=reader[i].cs_idx) && (reader[i].typ & R_IS_NETWORK)) 949 { 950 client[cs_idx].last=time((time_t)0); 951 rht = gethostbyname(reader[i].device); 952 if (rht) 953 { 954 memcpy(&client[idx].udp_sa.sin_addr, rht->h_addr, 955 sizeof(client[idx].udp_sa.sin_addr)); 956 client[idx].ip=cs_inet_order(client[idx].udp_sa.sin_addr.s_addr); 957 } 958 else 959 cs_log("can't resolve %s", reader[i].device); 960 client[cs_idx].last=time((time_t)0); 961 } 962 962 } 963 963 … … 996 996 static void start_resolver() 997 997 { 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 // sleep(cfg->resolvedelay);1012 998 int i; 999 1000 cs_sleepms(1000); // wait for reader 1001 while(1) 1002 { 1003 if (master_pid!=getppid()) 1004 cs_exit(0); 1005 cs_resolve(); 1006 for (i=0; i<cfg->resolvedelay; i++) 1007 if (master_pid!=getppid()) 1008 cs_exit(0); 1009 else 1010 cs_sleepms(1000); 1011 // sleep(cfg->resolvedelay); 1012 } 1013 1013 } 1014 1014 … … 1141 1141 int cs_auth_client(struct s_auth *account, char *e_txt) 1142 1142 { 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1143 int rc=0; 1144 char buf[32]; 1145 char *t_crypt="encrypted"; 1146 char *t_plain="plain"; 1147 char *t_grant=" granted"; 1148 char *t_reject=" rejected"; 1149 char *t_msg[]= { buf, "invalid access", "invalid ip", "unknown reason" }; 1150 client[cs_idx].grp=0xffffffff; 1151 client[cs_idx].au=(-1); 1152 switch((long)account) 1153 { 1154 case -2: // gbx-dummy 1155 client[cs_idx].dup=0; 1156 break; 1157 case 0: // reject access 1158 rc=1; 1159 cs_log("%s %s-client %s%s (%s)", 1160 client[cs_idx].crypted ? t_crypt : t_plain, 1161 ph[client[cs_idx].ctyp].desc, 1162 client[cs_idx].ip ? cs_inet_ntoa(client[cs_idx].ip) : "", 1163 client[cs_idx].ip ? t_reject : t_reject+1, 1164 e_txt ? e_txt : t_msg[rc]); 1165 break; 1166 default: // grant/check access 1167 if (client[cs_idx].ip && account->dyndns[0]) 1168 if (client[cs_idx].ip != account->dynip) 1169 rc=2; 1170 if (!rc) 1171 { 1172 client[cs_idx].dup=0; 1173 if (client[cs_idx].typ=='c') 1174 { 1175 client[cs_idx].expirationdate=account->expirationdate; 1176 client[cs_idx].disabled=account->disabled; 1177 client[cs_idx].c35_suppresscmd08 = account->c35_suppresscmd08; 1178 client[cs_idx].ncd_keepalive = account->ncd_keepalive; 1179 client[cs_idx].grp=account->grp; 1180 client[cs_idx].au=account->au; 1181 client[cs_idx].autoau=account->autoau; 1182 client[cs_idx].tosleep=(60*account->tosleep); 1183 memcpy(&client[cs_idx].ctab, &account->ctab, sizeof(client[cs_idx].ctab)); 1184 if (account->uniq) 1185 cs_fake_client(account->usr, account->uniq, client[cs_idx].ip); 1186 client[cs_idx].ftab = account->ftab; // IDENT filter 1187 client[cs_idx].cltab = account->cltab; // CLASS filter 1188 client[cs_idx].fchid = account->fchid; // CHID filter 1189 client[cs_idx].sidtabok= account->sidtabok; // services 1190 client[cs_idx].sidtabno= account->sidtabno; // services 1191 client[cs_idx].pcrc = crc32(0L, MD5((uchar *)account->pwd, strlen(account->pwd), NULL), 16); 1192 memcpy(&client[cs_idx].ttab, &account->ttab, sizeof(client[cs_idx].ttab)); 1193 1193 #ifdef CS_ANTICASC 1194 1195 #endif 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1194 ac_init_client(account); 1195 #endif 1196 } 1197 } 1198 client[cs_idx].monlvl=account->monlvl; 1199 strcpy(client[cs_idx].usr, account->usr); 1200 case -1: // anonymous grant access 1201 if (rc) 1202 t_grant=t_reject; 1203 else 1204 { 1205 if (client[cs_idx].typ=='m') 1206 sprintf(t_msg[0], "lvl=%d", client[cs_idx].monlvl); 1207 else 1208 { 1209 if(client[cs_idx].autoau) 1210 { 1211 if(client[cs_idx].ncd_server) 1212 { 1213 int r=0; 1214 for(r=0;r<CS_MAXREADER;r++) 1215 { 1216 if(reader[r].caid[0]==cfg->ncd_ptab.ports[client[cs_idx].port_idx].ftab.filts[0].caid) 1217 { 1218 client[cs_idx].au=r; 1219 break; 1220 } 1221 } 1222 if(client[cs_idx].au<0) sprintf(t_msg[0], "au(auto)=%d", client[cs_idx].au+1); 1223 else sprintf(t_msg[0], "au(auto)=%s", reader[client[cs_idx].au].label); 1224 } 1225 else 1226 { 1227 sprintf(t_msg[0], "au=auto"); 1228 } 1229 } 1230 else 1231 { 1232 if(client[cs_idx].au<0) sprintf(t_msg[0], "au=%d", client[cs_idx].au+1); 1233 else sprintf(t_msg[0], "au=%s", reader[client[cs_idx].au].label); 1234 } 1235 } 1236 } 1237 if(client[cs_idx].ncd_server) 1238 { 1239 cs_log("%s %s:%d-client %s%s (%s, %s)", 1240 client[cs_idx].crypted ? t_crypt : t_plain, 1241 e_txt ? e_txt : ph[client[cs_idx].ctyp].desc, 1242 cfg->ncd_ptab.ports[client[cs_idx].port_idx].s_port, 1243 client[cs_idx].ip ? cs_inet_ntoa(client[cs_idx].ip) : "", 1244 client[cs_idx].ip ? t_grant : t_grant+1, 1245 username(cs_idx), t_msg[rc]); 1246 } 1247 else 1248 { 1249 cs_log("%s %s-client %s%s (%s, %s)", 1250 client[cs_idx].crypted ? t_crypt : t_plain, 1251 e_txt ? e_txt : ph[client[cs_idx].ctyp].desc, 1252 client[cs_idx].ip ? cs_inet_ntoa(client[cs_idx].ip) : "", 1253 client[cs_idx].ip ? t_grant : t_grant+1, 1254 username(cs_idx), t_msg[rc]); 1255 } 1256 1257 break; 1258 } 1259 return(rc); 1260 1260 } 1261 1261 … … 2569 2569 client[0].last=time((time_t *)0); 2570 2570 2571 start_client_resolver(); 2571 if(cfg->clientdyndns) 2572 start_client_resolver(); 2573 2572 2574 init_service(97); // logger 2573 2575 init_service(98); // resolver
Note:
See TracChangeset
for help on using the changeset viewer.