Changeset 11160
- Timestamp:
- 11/12/11 15:22:30 (12 years ago)
- Location:
- titan/titan
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/cam.h
r11145 r11160 41 41 //flag 0 = from zap 42 42 //flag 1 = from watchthread 43 //flag 2 = from cathread 43 //flag 2 = from cathread / caservicedel 44 44 //flag 3 = from recordthread 45 45 int caserviceadd(struct service* snode, int flag) … … 89 89 if(caservice[i].count < 1) 90 90 { 91 caservice[i].service = NULL;92 caservice[i].channel = NULL;93 91 if(caservice[i].camsockfd > -1) 94 92 sockclose(&caservice[i].camsockfd); 95 93 if(caservice[i].caslot > -1) 94 { 95 sendcapmt(caservice[i].service, 1, 2); 96 96 caservice[i].caslot = -1; 97 } 98 caservice[i].service = NULL; 99 caservice[i].channel = NULL; 97 100 } 98 101 } … … 203 206 //flag 0 = from zap 204 207 //flag 1 = from watchthread 205 //flag 2 = from cathread 208 //flag 2 = from cathread / caservicedel 206 209 //flag 3 = from recordthread 207 void sendcapmt(struct service* node, int flag)210 void sendcapmt(struct service* node, int clear, int flag) 208 211 { 209 212 int pos = 10, i = 0, lenbytes = 0, round = 0, caservicenr = 0; … … 265 268 } 266 269 267 caservicenr = caserviceadd(node, flag); 268 if(caservicenr < 0) 269 { 270 debug(620, "service is decrypt"); 271 free(buf); 272 return; 270 if(clear == 0) 271 { 272 caservicenr = caserviceadd(node, flag); 273 if(caservicenr < 0) 274 { 275 debug(620, "service is decrypt"); 276 free(buf); 277 return; 278 } 273 279 } 274 280 … … 333 339 } 334 340 335 while(cadescnode != NULL )341 while(cadescnode != NULL && clear == 0) 336 342 { 337 343 if(cadescnode->len > 0) … … 379 385 { 380 386 #ifdef CAMSUPP 381 if(caservice[caservicenr].caslot < 0 )387 if(caservice[caservicenr].caslot < 0 || clear == 1) 382 388 sendcapmttocam(node, buf, pos, caservicenr); 383 389 #endif 384 round = 1; 385 goto start; 390 if(clear == 0) 391 { 392 round = 1; 393 goto start; 394 } 386 395 } 387 396 else … … 408 417 sockcheck(&caservice[i].camsockfd); 409 418 if(caservice[i].camsockfd < 0 || caservice[i].caslot < 0) 410 sendcapmt(caservice[i].service, 1);419 sendcapmt(caservice[i].service, 0, 1); 411 420 } 412 421 } -
titan/titan/record.h
r11054 r11160 724 724 } 725 725 else 726 sendcapmt(servicenode, 3);726 sendcapmt(servicenode, 0, 3); 727 727 m_unlock(&status.servicemutex, 2); 728 728 -
titan/titan/service.h
r11055 r11160 214 214 } 215 215 else 216 sendcapmt(status.aktservice, 0 );216 sendcapmt(status.aktservice, 0, 0); 217 217 } 218 218 free(patbuf); … … 397 397 } 398 398 else 399 sendcapmt(status.aktservice, 0 );399 sendcapmt(status.aktservice, 0, 0); 400 400 } 401 401 free(patbuf);
Note: See TracChangeset
for help on using the changeset viewer.