- Timestamp:
- 10/18/20 17:21:23 (3 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r11630 r11657 362 362 * =========================== */ 363 363 #define CS_VERSION "1.20_svn" 364 #ifndef CS_SVN_VERSION 365 # define CS_SVN_VERSION "test" 366 #endif 364 367 #ifdef CS_CACHEEX 365 368 #ifdef CS_CACHEEX_AIO 366 #define CS_AIO_VERSION "9.2.6" 367 #endif 368 #endif 369 #ifndef CS_SVN_VERSION 370 # define CS_SVN_VERSION "test" 369 #define CS_AIO_VERSION CS_SVN_VERSION 370 #endif 371 371 #endif 372 372 #ifndef CS_TARGET -
trunk/module-camd35-cacheex.c
r11655 r11657 40 40 !check_client(cl) || 41 41 !( 42 (cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1)) ||43 (cl->typ == 'p' && cl->reader->cacheex.mode == 3)42 (cl->typ == 'c' && cl->account->cacheex.mode > 0) || 43 (cl->typ == 'p' && cl->reader->cacheex.mode > 0) 44 44 ) 45 45 ) … … 74 74 memset(&lgonly_tab, 0, sizeof(lgonly_tab)); 75 75 76 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1))76 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1)) 77 77 { 78 78 lgonly_tab = &cl->account->cacheex.lg_only_tab; … … 81 81 { 82 82 lgonly_tab = &cl->reader->cacheex.lg_only_tab; 83 } 84 else 85 { 86 return; 83 87 } 84 88 … … 86 90 if(cfg.cacheex_lg_only_remote_settings || 87 91 ( 88 (cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.lg_only_remote_settings)92 (cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.lg_only_remote_settings) 89 93 || (cl->typ == 'p' && cl->reader->cacheex.mode == 3 && cl->reader->cacheex.lg_only_remote_settings) 90 94 ) … … 158 162 memset(&filter, 0, sizeof(filter)); 159 163 160 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.allow_filter)164 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.allow_filter) 161 165 { 162 166 filter = &cl->account->cacheex.filter_caidtab; … … 165 169 { 166 170 filter = &cl->reader->cacheex.filter_caidtab; 171 } 172 else 173 { 174 return; 167 175 } 168 176 … … 206 214 memset(&ctab, 0, sizeof(ctab)); 207 215 208 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 ||cl->account->cacheex.mode == 1)) 209 { 210 ctab = &cl->account->cacheex.cacheex_nopushafter_tab; 211 } 212 else if(cl->typ == 'p' && cl->reader->cacheex.mode == 3) 213 { 214 ctab = &cl->reader->cacheex.cacheex_nopushafter_tab; 215 } 216 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1)) 217 { 218 ctab = &cl->account->cacheex.cacheex_nopushafter_tab; 219 } 220 else if(cl->typ == 'p' && cl->reader->cacheex.mode == 3) 221 { 222 ctab = &cl->reader->cacheex.cacheex_nopushafter_tab; 223 } 224 else 225 { 226 return; 227 } 216 228 217 229 filter_count = buf[i+4]; … … 244 256 // max hop 245 257 case 16: 246 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.allow_maxhop)258 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.allow_maxhop) 247 259 { 248 260 cl->account->cacheex.maxhop = buf[24]; … … 272 284 memset(&lgonly_tab, 0, sizeof(lgonly_tab)); 273 285 274 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1))286 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1)) 275 287 { 276 288 lgonly_tab = &cl->account->cacheex.lg_only_tab; … … 279 291 { 280 292 lgonly_tab = &cl->reader->cacheex.lg_only_tab; 293 } 294 else 295 { 296 return; 281 297 } 282 298 … … 287 303 if(cfg.cacheex_lg_only_remote_settings || 288 304 ( 289 (cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.lg_only_remote_settings)305 (cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1) && cl->account->cacheex.lg_only_remote_settings) 290 306 || (cl->typ == 'p' && cl->reader->cacheex.mode == 3 && cl->reader->cacheex.lg_only_remote_settings) 291 307 || !lgonly_tab->nfilts … … 1610 1626 break; 1611 1627 case 0x41: // cacheex-features answer 1612 camd35_cacheex_feature_request_save(client, mbuf);1628 // camd35_cacheex_feature_request_save(client, mbuf); 1613 1629 break; 1614 1630 case 0x42: // cacheex-feature trigger in … … 1654 1670 break; 1655 1671 case 0x41: // cacheex-features answer 1656 camd35_cacheex_feature_request_save(client, buf);1672 // camd35_cacheex_feature_request_save(client, buf); 1657 1673 break; 1658 1674 case 0x42: // cacheex-feature trigger in -
trunk/module-cccam-cacheex.c
r11655 r11657 42 42 !check_client(cl) || 43 43 !( 44 (cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1)) ||45 (cl->typ == 'p' && cl->reader->cacheex.mode == 3)44 (cl->typ == 'c' && cl->account->cacheex.mode > 0) || 45 (cl->typ == 'p' && cl->reader->cacheex.mode > 0) 46 46 ) 47 47 ) … … 83 83 { 84 84 lgonly_tab = &cl->reader->cacheex.lg_only_tab; 85 } 86 else 87 { 88 return; 85 89 } 86 90 … … 168 172 filter = &cl->reader->cacheex.filter_caidtab; 169 173 } 174 else 175 { 176 return; 177 } 170 178 171 179 cecspvaluetab_clear(filter); … … 209 217 210 218 if(cl->typ == 'c' && (cl->account->cacheex.mode == 2 || cl->account->cacheex.mode == 1)) 211 { 212 ctab = &cl->account->cacheex.cacheex_nopushafter_tab; 213 } 214 else if(cl->typ == 'p' && cl->reader->cacheex.mode == 3) 215 { 216 ctab = &cl->reader->cacheex.cacheex_nopushafter_tab; 217 } 219 { 220 ctab = &cl->account->cacheex.cacheex_nopushafter_tab; 221 } 222 else if(cl->typ == 'p' && cl->reader->cacheex.mode == 3) 223 { 224 ctab = &cl->reader->cacheex.cacheex_nopushafter_tab; 225 } 226 else 227 { 228 return; 229 } 218 230 219 231 filter_count = buf[i+4]; … … 281 293 { 282 294 lgonly_tab = &cl->reader->cacheex.lg_only_tab; 295 } 296 else 297 { 298 return; 283 299 } 284 300
Note:
See TracChangeset
for help on using the changeset viewer.