Changeset 4084

Show
Ignore:
Timestamp:
07/27/07 17:16:37 (7 years ago)
Author:
piers
Message:

Patch (rat-64bit.patch) from Doug 20 july 2007 fixes - thanks:
"With 64bit systems, the RAT UI would show ghost ssrc entries as a 64bit
value, the upper 32bits were random values, but the lower 32bits
corresponded to existing entries."

Location:
rat/trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • rat/trunk/mbus_engine.c

    r3969 r4084  
    10451045        mbus_parse_int(mp, &ttl); 
    10461046        mbus_parse_done(mp); 
    1047         debug_msg("rx_rtp_addr: New Addr:%d,rx_port:%d,tx_port:%d,ttl:%d\n",addr, rx_port, tx_port, ttl); 
     1047        debug_msg("rx_rtp_addr: New Addr:%s,rx_port:%d,tx_port:%d,ttl:%d\n",addr, rx_port, tx_port, ttl); 
    10481048 
    10491049        if (sp->rtp_session_count) { 
  • rat/trunk/ui_send_audio.c

    r3755 r4084  
    607607        render_3D_get_parameters(p->render_3D_data, &azimuth, &filter_type, &filter_length); 
    608608        filter_name = mbus_encode_str(render_3D_filter_get_name(filter_type)); 
    609         mbus_qmsgf(sp->mbus_engine, addr, TRUE, "audio.3d.user.settings", "\"%08lx\" %s %d %d", ssrc, filter_name, filter_length, azimuth); 
     609        mbus_qmsgf(sp->mbus_engine, addr, TRUE, "audio.3d.user.settings", "\"%08lx\" %s %d %d", (unsigned long) ssrc, filter_name, filter_length, azimuth); 
    610610        xfree(filter_name); 
    611611} 
  • rat/trunk/ui_send_rtp.c

    r3969 r4084  
    3535        } 
    3636        arg = mbus_encode_str(val); 
    37         mbus_qmsgf(sp->mbus_engine, addr, FALSE, item, "\"%08lx\" %s", ssrc, arg); 
     37        mbus_qmsgf(sp->mbus_engine, addr, FALSE, item, "\"%08lx\" %s", (unsigned long)ssrc, arg); 
    3838        xfree(arg); 
    3939} 
     
    4141void ui_send_rtp_cname(session_t *sp, char *addr, uint32_t ssrc) 
    4242{ 
    43         ui_info_update_sdes(sp, addr, "rtp.source.cname", rtp_get_sdes(sp->rtp_session[0], ssrc, RTCP_SDES_CNAME), ssrc); 
     43        ui_info_update_sdes(sp, addr, "rtp.source.cname", rtp_get_sdes(sp->rtp_session[0], ssrc, RTCP_SDES_CNAME), (unsigned long)ssrc); 
    4444} 
    4545 
     
    107107        if (!sp->ui_on) return; 
    108108        if (pdb_item_get(sp->pdb, ssrc, &pdbe)) { 
    109                 mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.gain", "\"%08lx\" %.2f", pdbe->ssrc, pdbe->gain); 
     109                mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.gain", "\"%08lx\" %.2f", (unsigned long)pdbe->ssrc, pdbe->gain); 
    110110        } 
    111111} 
     
    117117        if (!sp->ui_on) return; 
    118118        if (pdb_item_get(sp->pdb, ssrc, &pdbe)) { 
    119                 mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.mute", "\"%08lx\" %d", pdbe->ssrc, pdbe->mute); 
     119                mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.mute", "\"%08lx\" %d", (unsigned long)pdbe->ssrc, pdbe->mute); 
    120120        } 
    121121} 
     
    125125{ 
    126126        if (!sp->ui_on) return; 
    127         mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.remove", "\"%08lx\"", ssrc); 
     127        mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.remove", "\"%08lx\"", (unsigned long)ssrc); 
    128128} 
    129129 
     
    132132{ 
    133133        if (!sp->ui_on) return; 
    134         mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.active", "\"%08lx\"", ssrc); 
     134        mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.active", "\"%08lx\"", (unsigned long)ssrc); 
    135135} 
    136136 
     
    140140        session_validate(sp); 
    141141        if (!sp->ui_on) return; 
    142         mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.inactive", "\"%08lx\"", ssrc); 
     142        mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.inactive", "\"%08lx\"", (unsigned long)ssrc); 
    143143} 
    144144 
     
    147147{ 
    148148        if (!sp->ui_on) return; 
    149         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "rtp.source.packet.loss", "\"%08lx\" \"%08lx\" %3d", srce, dest, loss); 
     149        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "rtp.source.packet.loss", "\"%08lx\" \"%08lx\" %3d", (unsigned long)srce, (unsigned long)dest, loss); 
    150150} 
    151151 
     
    154154{ 
    155155        if (!sp->ui_on) return; 
    156         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "rtp.source.rtt", "\"%08lx\" %6ld", ssrc, (uint32_t) (1000 * rtt_sec)); 
     156        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "rtp.source.rtt", "\"%08lx\" %6ld", (unsigned long)ssrc, (uint32_t) (1000 * rtt_sec)); 
    157157} 
    158158 
     
    161161{ 
    162162        if (!sp->ui_on) return; 
    163         mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.ssrc", "\"%08lx\"", rtp_my_ssrc(sp->rtp_session[0])); 
     163        mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.ssrc", "\"%08lx\"", (unsigned long)rtp_my_ssrc(sp->rtp_session[0])); 
    164164} 
    165165 
     
    194194        if (!sp->ui_on) return; 
    195195        enc_siteid = mbus_encode_str(siteid); 
    196         mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.app.site", "\"%08lx\" %s", ssrc, enc_siteid); 
     196        mbus_qmsgf(sp->mbus_engine, addr, TRUE, "rtp.source.app.site", "\"%08lx\" %s", (unsigned long)ssrc, enc_siteid); 
    197197        xfree(enc_siteid); 
    198198} 
  • rat/trunk/ui_send_stats.c

    r3642 r4084  
    7575        } 
    7676 
    77         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.audio.buffered", "\"%08lx\" %ld", pdbe->ssrc, buffered); 
    78         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.audio.delay", "\"%08lx\" %ld", pdbe->ssrc, delay); 
    79         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.audio.skew", "\"%08lx\" %.5f", pdbe->ssrc, skew_rate); 
    80         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.spike.events", "\"%08lx\" %ld", pdbe->ssrc, pdbe->spike_events); 
    81         mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.spike.toged", "\"%08lx\" %ld",  pdbe->ssrc, pdbe->spike_toged); 
     77        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.audio.buffered", "\"%08lx\" %ld", (unsigned long)pdbe->ssrc, buffered); 
     78        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.audio.delay", "\"%08lx\" %ld", (unsigned long)pdbe->ssrc, delay); 
     79        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.audio.skew", "\"%08lx\" %.5f", (unsigned long)pdbe->ssrc, skew_rate); 
     80        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.spike.events", "\"%08lx\" %ld", (unsigned long)pdbe->ssrc, pdbe->spike_events); 
     81        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "tool.rat.spike.toged", "\"%08lx\" %ld",  (unsigned long)pdbe->ssrc, pdbe->spike_toged); 
    8282        my_ssrc = rtp_my_ssrc(sp->rtp_session[0]); 
    8383        rr = rtp_get_rr(sp->rtp_session[0], my_ssrc, pdbe->ssrc); 
     
    9393        ui_send_rtp_packet_loss(sp, addr, my_ssrc, pdbe->ssrc, fract_lost); 
    9494        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "rtp.source.reception", "\"%08lx\" %6ld %6ld %6ld %6ld %6ld %6d", 
    95                   pdbe->ssrc, pdbe->received, total_lost, pdbe->misordered, pdbe->duplicates, timestamp_to_ms(pdbe->jitter), pdbe->jit_toged); 
     95                  (unsigned long)pdbe->ssrc, pdbe->received, total_lost, pdbe->misordered, pdbe->duplicates, timestamp_to_ms(pdbe->jitter), pdbe->jit_toged); 
    9696        mbus_qmsgf(sp->mbus_engine, addr, FALSE, "rtp.source.packet.duration", "\"%08lx\" %3d", 
    97                    pdbe->ssrc, pdbe->inter_pkt_gap * 1000 / pdbe->sample_rate); 
     97                   (unsigned long)pdbe->ssrc, pdbe->inter_pkt_gap * 1000 / pdbe->sample_rate); 
    9898} 
    9999