diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:14:32 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:14:32 +0000 |
| commit | f9f33f16fbad3c7f228791cb1f4e38b4d73ced73 (patch) | |
| tree | 629fd8245dca6f6351b5dcf9560420dfb221655e /main/rtp.c | |
| parent | c7864bc14b10cc91805378e278f007019dfc7187 (diff) | |
Merged revisions 105840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r105840 | tilghman | 2008-03-04 17:04:29 -0600 (Tue, 04 Mar 2008) | 2 lines
Whitespace changes only
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106306 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/rtp.c b/main/rtp.c index 6e6004519..9777a5183 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -584,7 +584,7 @@ static int stun_get_mapped(struct stun_attr *attr, void *arg) * \return 0 on success, other values on error. */ int ast_stun_request(int s, struct sockaddr_in *dst, - const char *username, struct sockaddr_in *answer) + const char *username, struct sockaddr_in *answer) { struct stun_header *req; unsigned char reqdata[1024]; @@ -1108,7 +1108,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) pt = (length & 0xff0000) >> 16; rc = (length & 0x1f000000) >> 24; length &= 0xffff; - + if ((i + length) > packetwords) { if (option_debug || rtpdebug) ast_log(LOG_DEBUG, "RTCP Read too short\n"); @@ -1121,7 +1121,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) ast_verbose("Reception reports: %d\n", rc); ast_verbose("SSRC of sender: %u\n", rtcpheader[i + 1]); } - + i += 2; /* Advance past header and ssrc */ switch (pt) { @@ -1130,7 +1130,7 @@ struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp) rtp->rtcp->spc = ntohl(rtcpheader[i+3]); rtp->rtcp->soc = ntohl(rtcpheader[i + 4]); rtp->rtcp->themrxlsr = ((ntohl(rtcpheader[i]) & 0x0000ffff) << 16) | ((ntohl(rtcpheader[i + 1]) & 0xffff0000) >> 16); /* Going to LSR in RR*/ - + if (rtcp_debug_test_addr(&sin)) { ast_verbose("NTP timestamp: %lu.%010lu\n", (unsigned long) ntohl(rtcpheader[i]), (unsigned long) ntohl(rtcpheader[i + 1]) * 4096); ast_verbose("RTP timestamp: %lu\n", (unsigned long) ntohl(rtcpheader[i + 2])); @@ -1973,7 +1973,7 @@ void ast_rtp_set_m_type(struct ast_rtp* rtp, int pt) } /*! \brief remove setting from payload type list if the rtpmap header indicates - an unknown media type */ + an unknown media type */ void ast_rtp_unset_m_type(struct ast_rtp* rtp, int pt) { rtp_bridge_lock(rtp); |