Changeset 1662


Ignore:
Timestamp:
02/23/10 19:24:19 (11 years ago)
Author:
alno
Message:

WebIf:

  • Merge 1675, 1660-1661 of trunc
Location:
branches/monitor-improvement
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/module-cccam.c

    r1646 r1662  
    351351
    352352  cc_crypt(&cc->block[DECRYPT], netbuf, 4, DECRYPT);
    353   //cs_ddump(netbuf, 4, "cccam: decrypted header:");
     353  cs_ddump(netbuf, 4, "cccam: decrypted header:");
    354354
    355355  g_flag = netbuf[0];
     
    11541154
    11551155  // send passwd ack
    1156   bzero(data, 20);
    1157   memcpy(data, "CCcam\0", 6);
    1158   cs_ddump(data, 20, "cccam: send ack:");
    1159   cc_crypt(&cc->block[ENCRYPT], data, 20, ENCRYPT);
    1160   send(pfd, data, 20, 0);
     1156  bzero(buf, 20);
     1157  memcpy(buf, "CCcam\0", 6);
     1158  cs_ddump(buf, 20, "cccam: send ack:");
     1159  cc_crypt(&cc->block[ENCRYPT], buf, 20, ENCRYPT);
     1160  send(pfd, buf, 20, 0);
    11611161
    11621162  // recv cli data
     
    12611261    struct hostent *server;
    12621262    server = gethostbyname(reader[ridx].device);
    1263     bcopy((char *)server->h_addr, (char *)&client[cs_idx].udp_sa.sin_addr.s_addr, server->h_length);
     1263    memmove((char *)&client[cs_idx].udp_sa.sin_addr.s_addr, (char *)server->h_addr, server->h_length);
    12641264
    12651265    if (reader[ridx].tcp_rto <= 0) reader[ridx].tcp_rto = 60 * 60 * 10;  // timeout to 10 hours
  • branches/monitor-improvement/module-dvbapi.c

    r1624 r1662  
    5757    unsigned char lastcw0[8];
    5858    unsigned char lastcw1[8];
    59     pthread_t descramble_thread;
    60     unsigned int thread_active;
    6159} DEMUXTYPE;
    6260#define DMX_FILTER_SIZE 16
     
    425423        close(demux[demux_id].demux_emm_fd);
    426424        demux[demux_id].demux_emm_fd=0;
    427     }
    428 
    429     if (demux[demux_id].thread_active == 0) {
    430         pthread_cancel(demux[demux_id].descramble_thread);
    431         pthread_join(demux[demux_id].descramble_thread, NULL);
    432         demux[demux_id].thread_active = -1;
    433425    }
    434426
     
    879871    if (demux[demux_id].ECMpidcount>0) {
    880872        dvbapi_resort_ecmpids(demux_id);
    881         if (demux[demux_id].ECMpidcount>0) {}
    882             demux[demux_id].thread_active=pthread_create(&demux[demux_id].descramble_thread, NULL, thread_descrambling, (void*)demux_id);
     873        if (demux[demux_id].ECMpidcount>0) {
     874            pthread_t p3;
     875            if (pthread_create(&p3, NULL, thread_descrambling, (void*)demux_id))
     876                cs_log("dvbapi: pthread error");
     877        }
    883878    }
    884879
     
    10471042        demux[i].ca_fd=0;
    10481043        demux[i].demux_index=-1;
    1049         demux[i].thread_active = -1;
    10501044        memset(demux[i].buffer_cache_dmx,0 ,12);
    10511045    }
  • branches/monitor-improvement/module-radegast.c

    r1126 r1662  
    261261  struct hostent *server;
    262262  server = gethostbyname(reader[ridx].device);
    263   bcopy((char *)server->h_addr, (char *)&client[cs_idx].udp_sa.sin_addr.s_addr, server->h_length);
     263  memmove((char *)&client[cs_idx].udp_sa.sin_addr.s_addr, (char *)server->h_addr, server->h_length);
    264264
    265265  cs_log("radegast: proxy %s:%d (fd=%d)",
Note: See TracChangeset for help on using the changeset viewer.