sipwise
/
sems
mirror of https://github.com/sipwise/sems.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#62181 transport: slight reformat

Browse Source 
Remove trailing spaces and simplify log message format.

Change-Id: If834dba49394de0947d6b881002bc5d98c1fe304
mr13.3.1
Richard Fuchs 1 year ago
parent 80d986e149
commit c2c70d0f56
6 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File

24
core/sip/tcp_trsp.cpp
Unescape View File

@ -108,7 +108,7 @@ void tcp_trsp_socket::add_read_event_ul()
{
sock_mut.unlock();
add_read_event();
sock_mut.lock();
sock_mut.lock();
}
void tcp_trsp_socket::add_read_event()
@ -133,7 +133,7 @@ void tcp_trsp_socket::copy_peer_addr(sockaddr_storage* sa)
memcpy(sa,&peer_addr,sizeof(sockaddr_storage));
}
tcp_trsp_socket::msg_buf::msg_buf(const sockaddr_storage* sa, const char* msg,
tcp_trsp_socket::msg_buf::msg_buf(const sockaddr_storage* sa, const char* msg,
const int msg_len)
: msg_len(msg_len)
{
@ -188,7 +188,7 @@ int tcp_trsp_socket::connect()
if((sd = socket(peer_addr.ss_family,SOCK_STREAM,0)) == -1){
ERROR("socket: %s\n",strerror(errno));
return -1;
}
}
int true_opt = 1;
if(ioctl(sd, FIONBIO , &true_opt) == -1) {
@ -202,7 +202,7 @@ int tcp_trsp_socket::connect()
am_inet_ntop(&peer_addr).c_str(),
am_get_port(&peer_addr));
return ::connect(sd, (const struct sockaddr*)&peer_addr,
return ::connect(sd, (const struct sockaddr*)&peer_addr,
SA_len(&peer_addr));
}
@ -241,7 +241,7 @@ int tcp_trsp_socket::check_connection()
return 0;
}
int tcp_trsp_socket::send(const sockaddr_storage* sa, const char* msg,
int tcp_trsp_socket::send(const sockaddr_storage* sa, const char* msg,
const int msg_len, unsigned int flags)
{
lock_guard<AmMutex> _l(sock_mut);
@ -608,14 +608,14 @@ int tcp_server_socket::bind(const string& bind_ip, unsigned short bind_port)
}
if(am_inet_pton(bind_ip.c_str(),&addr) == 0){
ERROR("am_inet_pton(%s): %s\n",bind_ip.c_str(),strerror(errno));
return -1;
}
if( ((addr.ss_family == AF_INET) &&
if( ((addr.ss_family == AF_INET) &&
(SAv4(&addr)->sin_addr.s_addr == INADDR_ANY)) ||
((addr.ss_family == AF_INET6) &&
((addr.ss_family == AF_INET6) &&
IN6_IS_ADDR_UNSPECIFIED(&SAv6(&addr)->sin6_addr)) ){
ERROR("Sorry, we cannot bind to 'ANY' address\n");
@ -627,12 +627,12 @@ int tcp_server_socket::bind(const string& bind_ip, unsigned short bind_port)
if((sd = socket(addr.ss_family,SOCK_STREAM,0)) == -1){
ERROR("socket: %s\n",strerror(errno));
return -1;
}
}
int true_opt = 1;
if(setsockopt(sd, SOL_SOCKET, SO_REUSEADDR,
(void*)&true_opt, sizeof (true_opt)) == -1) {
ERROR("%s\n",strerror(errno));
return -1;
}
@ -732,7 +732,7 @@ void tcp_server_socket::on_accept(int sd, short ev)
uint32_t h = hash_addr(&src_addr);
unsigned int idx = h % workers.size();
// in case of thread pooling, do following in worker thread
DBG("tcp_trsp_socket::create_connected (idx = %u)",idx);
tcp_trsp_socket::create_connected(this,workers[idx],connection_sd,

22
core/sip/tcp_trsp.h
Unescape View File

@ -30,14 +30,14 @@ class tcp_trsp_socket: public trsp_socket
{
tcp_server_socket* server_sock;
tcp_server_worker* server_worker;
bool closed;
bool connected;
sockaddr_storage peer_addr;
string peer_ip;
unsigned short peer_port;
bool peer_addr_valid;
parser_state pst;
unsigned char input_buf[MAX_TCP_MSGLEN];
size_t input_len;
@ -51,8 +51,8 @@ class tcp_trsp_socket: public trsp_socket
char* msg;
int msg_len;
char* cursor;
msg_buf(const sockaddr_storage* sa, const char* msg,
msg_buf(const sockaddr_storage* sa, const char* msg,
const int msg_len);
~msg_buf();
@ -60,7 +60,7 @@ class tcp_trsp_socket: public trsp_socket
};
deque<msg_buf*> send_q;
AmMutex sock_mut;
unsigned char* get_input() { return input_buf + input_len; }
@ -86,7 +86,7 @@ class tcp_trsp_socket: public trsp_socket
*/
void create_events();
/*
/*
* Connects the socket to the destination
* given in constructor.
*/
@ -102,7 +102,7 @@ class tcp_trsp_socket: public trsp_socket
* Closes the connection/socket
*
* Warning: never do anything with the object
* after close as it could have been
* after close as it could have been
* destroyed.
*/
void close();
@ -164,11 +164,11 @@ public:
void copy_peer_addr(sockaddr_storage* sa);
const string& get_peer_ip() {
return peer_ip;
const string& get_peer_ip() {
return peer_ip;
}
unsigned short get_peer_port() {
unsigned short get_peer_port() {
return peer_port;
}
@ -277,7 +277,7 @@ protected:
void run();
/** @see AmThread */
void on_stop();
public:
/** @see transport */
tcp_trsp(tcp_server_socket* sock);

16
core/sip/transport.cpp
Unescape View File

@ -37,7 +37,7 @@ int trsp_socket::log_level_raw_msgs = L_DBG;
trsp_socket::trsp_socket(unsigned short if_num, unsigned int opts,
unsigned int sys_if_idx, int sd)
: sd(sd), ip(), port(0),
: sd(sd), ip(), port(0),
if_num(if_num), sys_if_idx(sys_if_idx),
socket_options(opts)
{
@ -64,7 +64,7 @@ void trsp_socket::set_public_ip(const string& ip)
{
public_ip = ip;
}
const char* trsp_socket::get_advertised_ip() const
{
if(!public_ip.empty())
@ -90,23 +90,23 @@ void trsp_socket::copy_addr_to(sockaddr_storage* sa) const
*/
bool trsp_socket::match_addr(sockaddr_storage* other_addr) const
{
if(addr.ss_family != other_addr->ss_family)
return false;
if(addr.ss_family == AF_INET){
if( !memcmp(&((sockaddr_in*)&addr)->sin_addr,
&((sockaddr_in*)other_addr)->sin_addr,
if( !memcmp(&((sockaddr_in*)&addr)->sin_addr,
&((sockaddr_in*)other_addr)->sin_addr,
sizeof(in_addr)) )
return true;
}
else if(addr.ss_family == AF_INET6) {
if( !memcmp(&((sockaddr_in6*)&addr)->sin6_addr,
&((sockaddr_in6*)other_addr)->sin6_addr,
if( !memcmp(&((sockaddr_in6*)&addr)->sin6_addr,
&((sockaddr_in6*)other_addr)->sin6_addr,
sizeof(in6_addr)) )
return true;
}
return false;
}

8
core/sip/transport.h
Unescape View File

@ -51,7 +51,7 @@ public:
};
static int log_level_raw_msgs;
protected:
// socket descriptor
int sd;
@ -97,7 +97,7 @@ public:
* Getter for IP address
*/
const char* get_ip() const;
/**
* Getter for the port number
*/
@ -107,7 +107,7 @@ public:
* Setter for public IP address
*/
void set_public_ip(const string& ip);
/**
* Getter for advertised IP address
* @return either bound IP or public IP
@ -149,7 +149,7 @@ public:
* Sends a message.
* @return -1 if error(s) occured.
*/
virtual int send(const sockaddr_storage* sa, const char* msg,
virtual int send(const sockaddr_storage* sa, const char* msg,
const int msg_len, unsigned int flags)=0;
};

42
core/sip/udp_trsp.cpp
Unescape View File

@ -56,16 +56,16 @@ int udp_trsp_socket::bind(const string& bind_ip, unsigned short bind_port)
close(sd);
sd = -1;
}
if(am_inet_pton(bind_ip.c_str(),&addr) == 0){
ERROR("am_inet_pton(%s): %s\n",bind_ip.c_str(),strerror(errno));
return -1;
}
if( ((addr.ss_family == AF_INET) &&
if( ((addr.ss_family == AF_INET) &&
(SAv4(&addr)->sin_addr.s_addr == INADDR_ANY)) ||
((addr.ss_family == AF_INET6) &&
((addr.ss_family == AF_INET6) &&
IN6_IS_ADDR_UNSPECIFIED(&SAv6(&addr)->sin6_addr)) ){
ERROR("Sorry, we cannot bind to 'ANY' address\n");
@ -84,20 +84,20 @@ int udp_trsp_socket::bind(const string& bind_ip, unsigned short bind_port)
ERROR("bind: %s\n",strerror(errno));
return -1;
}
int true_opt = 1;
if(addr.ss_family == AF_INET) {
if(setsockopt(sd, IPPROTO_IP, DSTADDR_SOCKOPT,
(void*)&true_opt, sizeof (true_opt)) == -1) {
ERROR("%s\n",strerror(errno));
return -1;
}
} else {
if(setsockopt(sd, IPPROTO_IPV6, DSTADDR6_SOCKOPT,
(void*)&true_opt, sizeof (true_opt)) == -1) {
ERROR("%s\n",strerror(errno));
return -1;
}
@ -140,12 +140,12 @@ int udp_trsp_socket::set_recvbuf_size(int rcvbuf_size)
return 0;
}
int udp_trsp_socket::sendto(const sockaddr_storage* sa,
const char* msg,
int udp_trsp_socket::sendto(const sockaddr_storage* sa,
const char* msg,
const int msg_len)
{
int err = ::sendto(sd, msg, msg_len, 0,
(const struct sockaddr*)sa,
int err = ::sendto(sd, msg, msg_len, 0,
(const struct sockaddr*)sa,
SA_len(sa));
if (err < 0) {
@ -163,8 +163,8 @@ int udp_trsp_socket::sendto(const sockaddr_storage* sa,
return 0;
}
int udp_trsp_socket::sendmsg(const sockaddr_storage* sa,
const char* msg,
int udp_trsp_socket::sendmsg(const sockaddr_storage* sa,
const char* msg,
const int msg_len)
{
struct msghdr hdr;
@ -203,13 +203,13 @@ int udp_trsp_socket::sendmsg(const sockaddr_storage* sa,
cmsg->cmsg_level = IPPROTO_IPV6;
cmsg->cmsg_type = IPV6_PKTINFO;
cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
struct in6_pktinfo* pktinfo = (struct in6_pktinfo*) CMSG_DATA(cmsg);
pktinfo->ipi6_ifindex = sys_if_idx;
}
hdr.msg_controllen = cmsg->cmsg_len;
// bytes_sent = ;
if(::sendmsg(sd, &hdr, 0) < 0) {
char host[NI_MAXHOST] = "";
@ -222,14 +222,14 @@ int udp_trsp_socket::sendmsg(const sockaddr_storage* sa,
return 0;
}
int udp_trsp_socket::send(const sockaddr_storage* sa,
const char* msg,
int udp_trsp_socket::send(const sockaddr_storage* sa,
const char* msg,
const int msg_len,
unsigned int flags)
{
if (log_level_raw_msgs >= 0) {
_LOG(log_level_raw_msgs,
"send msg to %s:%i\n--++--\n%.*s--++--\n",
"send msg to %s:%i\n%.*s\n",
get_addr_str(sa).c_str(),
ntohs(((sockaddr_in*)sa)->sin_port),
msg_len, msg);
@ -317,8 +317,8 @@ void udp_trsp::run()
if (trsp_socket::log_level_raw_msgs >= 0) {
char host[NI_MAXHOST] = "";
_LOG(trsp_socket::log_level_raw_msgs,
"vv M [|] u recvd msg via UDP from %s:%i vv\n"
"--++--\n%.*s--++--\n",
"received msg via UDP from %s:%i:\n"
"%.*s\n",
am_inet_ntop_sip(&s_msg->remote_ip,host,NI_MAXHOST),
am_get_port(&s_msg->remote_ip),
s_msg->len, s_msg->buf);

2
core/sip/udp_trsp.h
Unescape View File

@ -109,7 +109,7 @@ protected:
void run();
/** @see AmThread */
void on_stop();
public:
/** @see transport */
udp_trsp(udp_trsp_socket* sock);

Write Preview
Loading…
Cancel
Save