planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some improvements in colored debugging and more things.

Browse Source 
FossilOrigin-Name: 8405db3519985e661123754a83e4dbde153f29dd22007ed31853117220e21000
This commit is contained in:
7u83@mail.ru
2015-04-12 21:28:55 +00:00
parent 2ef7d1fc12
commit 6d707d1725
28 changed files with 302 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/capwap/conn_recv_packet.c
View File

@ -24,13 +24,14 @@
#include "conn.h"
int conn_recv_packet_(struct conn* conn,uint8_t *buf,int len,int flags)
#include "sock.h"
int conn_recv_packet_(struct conn *conn, uint8_t * buf, int len, int flags)
{
int n;
while( (n = recv(conn->sock,(char*)buf,len,flags)) < 0 ){
if (errno!=EINTR)
{
if ( errno==EAGAIN )
while ((n = recv(conn->sock, (char *) buf, len, flags)) < 0) {
if (errno != EINTR) {
if (errno == EAGAIN)
return n;
}
@ -39,17 +40,37 @@ int conn_recv_packet_(struct conn* conn,uint8_t *buf,int len,int flags)
}
int conn_recvfrom_packet(struct conn *conn, uint8_t * buf, int len,
struct sockaddr_storage *from)
{
socklen_t al;
al = sizeof(struct sockaddr_storage);
memset(from, 0, sizeof(struct sockaddr_storage));
int n;
while ((n = recvfrom(conn->sock, (char *) buf, len, 0, (struct sockaddr*)from, &al)) < 0) {
if (errno != EINTR) {
if (errno == EAGAIN)
return n;
}
}
return n;
}
/* yes, these functions could be better defined as macros in a .h file */
int conn_recv_packet(struct conn* conn,uint8_t *buf,int len)
int conn_recv_packet(struct conn *conn, uint8_t * buf, int len)
{
return conn_recv_packet_(conn,buf,len,0);
return conn_recv_packet_(conn, buf, len, 0);
}
int conn_recv_packet_peek(struct conn* conn,uint8_t *buf,int len)
int conn_recv_packet_peek(struct conn *conn, uint8_t * buf, int len)
{
int rc = conn_recv_packet_(conn,buf,len,MSG_PEEK);
int rc = conn_recv_packet_(conn, buf, len, MSG_PEEK);
return rc;
}
}