kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9452: fixed true/false logic for using dst flag

This commit is contained in:
Sebastian Denz 2016-08-22 16:02:27 +02:00
parent ae324c9846
commit ebaf95e709
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c
View File

@ -467,7 +467,7 @@ int tport_capt_msg_hepv2 (tport_t const *self, msg_t *msg, size_t n,
struct hep_ip6hdr hep_ip6header = {{{{0}}}}; struct hep_ip6hdr hep_ip6header = {{{{0}}}};
#endif #endif
int eth_frame_len = 16000; int eth_frame_len = 16000;
size_t i, dst = 0; size_t i, dst = 1;
tport_master_t *mr; tport_master_t *mr;
assert(self); assert(msg); assert(self); assert(msg);
@ -501,25 +501,25 @@ int tport_capt_msg_hepv2 (tport_t const *self, msg_t *msg, size_t n,
else hep_header.hp_p = IPPROTO_UDP; /* DEFAULT UDP */ else hep_header.hp_p = IPPROTO_UDP; /* DEFAULT UDP */
/* Check destination */ /* Check destination */
if(strncmp("sent", what, 4) == 0) dst = 1; if(strncmp("sent", what, 4) == 0) dst = 0;
/* copy destination and source IPs*/ /* copy destination and source IPs*/
if(su->su_family == AF_INET) { if(su->su_family == AF_INET) {
memcpy(dst ? &hep_ipheader.hp_dst : &hep_ipheader.hp_src, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr)); memcpy(dst ? &hep_ipheader.hp_src : &hep_ipheader.hp_dst, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr));
memcpy(dst ? &hep_ipheader.hp_src : &hep_ipheader.hp_dst, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr)); memcpy(dst ? &hep_ipheader.hp_dst : &hep_ipheader.hp_src, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr));
hep_header.hp_l += sizeof(struct hep_iphdr); hep_header.hp_l += sizeof(struct hep_iphdr);
} }
#if SU_HAVE_IN6 #if SU_HAVE_IN6
else { else {
memcpy(dst ? &hep_ip6header.hp6_dst : &hep_ip6header.hp6_src, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr)); memcpy(dst ? &hep_ip6header.hp6_src : &hep_ip6header.hp6_dst, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr));
memcpy(dst ? &hep_ip6header.hp6_src : &hep_ip6header.hp6_dst, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr)); memcpy(dst ? &hep_ip6header.hp6_dst : &hep_ip6header.hp6_src, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr));
hep_header.hp_l += sizeof(struct hep_ip6hdr); hep_header.hp_l += sizeof(struct hep_ip6hdr);
} }
#endif #endif
hep_header.hp_dport = dst ? su->su_port : su_self->su_port; hep_header.hp_dport = dst ? su_self->su_port : su->su_port;
hep_header.hp_sport = dst ? su_self->su_port : su->su_port; hep_header.hp_sport = dst ? su->su_port : su_self->su_port;
if (hep_header.hp_v == 2){ if (hep_header.hp_v == 2){
hep_header.hp_l += sizeof(struct hep_timehdr); hep_header.hp_l += sizeof(struct hep_timehdr);
@ -605,7 +605,7 @@ int tport_capt_msg_hepv3 (tport_t const *self, msg_t *msg, size_t n,
#endif #endif
int eth_frame_len = 16000; int eth_frame_len = 16000;
size_t i, dst = 0; size_t i, dst = 1;
tport_master_t *mr; tport_master_t *mr;
assert(self); assert(msg); assert(self); assert(msg);
@ -649,7 +649,7 @@ int tport_capt_msg_hepv3 (tport_t const *self, msg_t *msg, size_t n,
hg->ip_proto.chunk.length = htons(sizeof(hg->ip_proto)); hg->ip_proto.chunk.length = htons(sizeof(hg->ip_proto));
/* Check destination */ /* Check destination */
if(strncmp("sent", what, 4) == 0) dst = 1; if(strncmp("sent", what, 4) == 0) dst = 0;
/* copy destination and source IPs*/ /* copy destination and source IPs*/
if(su->su_family == AF_INET) { if(su->su_family == AF_INET) {
@ -657,13 +657,13 @@ int tport_capt_msg_hepv3 (tport_t const *self, msg_t *msg, size_t n,
/* SRC IP */ /* SRC IP */
src_ip4.chunk.vendor_id = htons(0x0000); src_ip4.chunk.vendor_id = htons(0x0000);
src_ip4.chunk.type_id = htons(0x0003); src_ip4.chunk.type_id = htons(0x0003);
memcpy(dst ? &dst_ip4.data : &src_ip4.data, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr)); memcpy(dst ? &src_ip4.data : &dst_ip4.data, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr));
src_ip4.chunk.length = htons(sizeof(src_ip4)); src_ip4.chunk.length = htons(sizeof(src_ip4));
/* DST IP */ /* DST IP */
dst_ip4.chunk.vendor_id = htons(0x0000); dst_ip4.chunk.vendor_id = htons(0x0000);
dst_ip4.chunk.type_id = htons(0x0004); dst_ip4.chunk.type_id = htons(0x0004);
memcpy(dst ? &src_ip4.data : &dst_ip4.data, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr)); memcpy(dst ? &dst_ip4.data : &src_ip4.data, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr));
dst_ip4.chunk.length = htons(sizeof(dst_ip4)); dst_ip4.chunk.length = htons(sizeof(dst_ip4));
iplen = sizeof(dst_ip4) + sizeof(src_ip4); iplen = sizeof(dst_ip4) + sizeof(src_ip4);
@ -674,13 +674,13 @@ int tport_capt_msg_hepv3 (tport_t const *self, msg_t *msg, size_t n,
/* SRC IPv6 */ /* SRC IPv6 */
src_ip6.chunk.vendor_id = htons(0x0000); src_ip6.chunk.vendor_id = htons(0x0000);
src_ip6.chunk.type_id = htons(0x0005); src_ip6.chunk.type_id = htons(0x0005);
memcpy(dst ? &dst_ip6.data : &src_ip6.data, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr)); memcpy(dst ? &src_ip6.data : &dst_ip6.data, &su->su_sin.sin_addr.s_addr, sizeof(su->su_sin.sin_addr.s_addr));
src_ip6.chunk.length = htons(sizeof(src_ip6)); src_ip6.chunk.length = htons(sizeof(src_ip6));
/* DST IPv6 */ /* DST IPv6 */
dst_ip6.chunk.vendor_id = htons(0x0000); dst_ip6.chunk.vendor_id = htons(0x0000);
dst_ip6.chunk.type_id = htons(0x0006); dst_ip6.chunk.type_id = htons(0x0006);
memcpy(dst ? &src_ip6.data : &dst_ip6.data, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr)); memcpy(dst ? &dst_ip6.data : &src_ip6.data, &su_self->su_sin.sin_addr.s_addr, sizeof(su_self->su_sin.sin_addr.s_addr));
dst_ip6.chunk.length = htons(sizeof(dst_ip6)); dst_ip6.chunk.length = htons(sizeof(dst_ip6));
iplen = sizeof(dst_ip6) + sizeof(src_ip6); iplen = sizeof(dst_ip6) + sizeof(src_ip6);