Changeset 11576


Ignore:
Timestamp:
02/26/20 22:29:26 (3 years ago)
Author:
felixka
Message:

[gbx] - more generalized routing info in cw msg

  • fix minor bugs
  • thanks @chimpie23
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/module-gbox.c

    r11574 r11576  
    10921092    er->gbox_crc = gbox_get_checksum(&er->ecm[0], er->ecmlen);
    10931093    er->gbox_ecm_dist = data[n - 15] + 1;
    1094 
     1094   
     1095    memcpy(&ere->gbox_routing_info[0], &data[n - 15 - er->gbox_ecm_dist + 1], er->gbox_ecm_dist - 1);
     1096   
    10951097    er->caid = gbox_get_caid(caprovid);
    10961098    er->prid = gbox_get_provid(caprovid);
     
    17721774    else
    17731775        { buf[41] = 0x01; } // source of cw -> card, emu
    1774        
     1776
    17751777    uint8_t cw_dist = gbox_get_crd_dist_lev(er->gbox_cw_src_peer) & 0xf;
    17761778
    17771779    buf[42] = ((check_setup()) | (cw_dist + 1));
    17781780    buf[43] = ere->gbox_rev & 0xf0;
    1779    
    1780     //buf[44] = 0;
    1781     //gbox_send(cli, buf, 45);
    1782 
     1781
     1782    // This copies the routing info from ECM to cw answer.
     1783    memcpy(&buf[44], &ere->gbox_routing_info, er->gbox_ecm_dist - 1);
     1784    buf[44 + er->gbox_ecm_dist - 1] = er->gbox_ecm_dist - 1;    //act. dist
     1785/*
    17831786  uint8_t i;
    17841787        for(i = 0; i < er->gbox_ecm_dist; i++)
     
    17861789            buf[44 +i] = i;
    17871790        }
    1788 
     1791*/
    17891792    gbox_send(cli, buf, 44 + er->gbox_ecm_dist);
    17901793
  • trunk/module-gbox.h

    r11547 r11576  
    168168struct gbox_ecm_request_ext
    169169{
    170     uint8_t gbox_hops;
    171     uint16_t gbox_peer;
    172     uint16_t gbox_mypeer;
    173170    uint8_t gbox_slot;
    174171    uint8_t gbox_version;
  • trunk/webif/config/cccreshare.html

    r11574 r11576  
    1 <!--    gbox part. not displayed when cccam not compiled in
    2 <TR><TD><A>CCcam reshare:</A></TD><TD><input name="ccc_reshare" type="hidden" value="0"><input name="ccc_reshare" type="checkbox" value="1" ##GBOXCCCRESHARE##><label>enable reshare cards cccam -> gbox</label></TD></TR>
    3 <TR><TD><A>CCC to Gbox caid:</A></TD><TD><input name="ccc_gbx_caid" type="text" maxlength="160" value="##CCC2GBOXCAID##"></TD></TR>
    4 -->
     1<!--    gbox part. not displayed when cccam not compiled in -->
     2
    53<TR><TD><A>Reshare ccc -> gbox - caid(s):</A></TD>
    64        <TD>
Note: See TracChangeset for help on using the changeset viewer.