ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-10 04:19:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compiler warnings on Linux gcc 4.7.1

Browse Source
This commit is contained in:
Andrew Bettison 2012-09-27 11:02:58 +09:30
parent ac3864ff20
commit fb7c9e5633
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overlay_interface.c
View File

@ -944,7 +944,7 @@ overlay_queue_remove(overlay_txqueue *queue, struct overlay_frame *frame){
return next;
}
/* XXX: unused */
#if 0 /* unused */
static int
overlay_queue_dump(overlay_txqueue *q)
{
@ -977,6 +977,7 @@ overlay_queue_dump(overlay_txqueue *q)
DEBUG(strbuf_str(b));
return 0;
}
#endif // 0
static void
overlay_init_packet(struct outgoing_packet *packet, overlay_interface *interface, int tick){

16
overlay_mdp.c
View File

@ -208,29 +208,25 @@ int overlay_mdp_process_bind_request(int sock, struct subscriber *subscriber, in
}
/* See if binding already exists */
int found=-1;
int found=-1; // XXX: this is never set, why is it here?
int free=-1;
for(i=0;i<MDP_MAX_BINDINGS;i++) {
/* Look for duplicate bindings */
if (mdp_bindings[i].port == port &&
mdp_bindings[i].subscriber == subscriber){
if (mdp_bindings[found].name_len==recvaddrlen &&
!memcmp(mdp_bindings[found].socket_name,recvaddr->sun_path,recvaddrlen)){
if (mdp_bindings[i].port == port && mdp_bindings[i].subscriber == subscriber) {
if (found != -1 &&
mdp_bindings[found].name_len==recvaddrlen &&
!memcmp(mdp_bindings[found].socket_name,recvaddr->sun_path,recvaddrlen)) {
// this client already owns this port binding?
INFO("Identical binding exists");
return 0;
}else if(flags&MDP_FORCE){
// steal the port binding
free=i;
free=i;
break;
}else{
return WHY("Port already in use");
}
}
/* Look for free slots in case we need one */
if ((free==-1)&&(mdp_bindings[i].port==0)) free=i;
}

3
server.c
View File

@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <signal.h>
#include <unistd.h>
#include <time.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/stat.h>
@ -479,7 +480,7 @@ int processRequest(unsigned char *packet,int len,
if (instrumentation_file)
{
if (!i_f) { if (strcmp(instrumentation_file,"-")) i_f=fopen(instrumentation_file,"a"); else i_f=stdout; }
if (i_f) fprintf(i_f,"%ld:%02x%02x%02x%02x:%d:%d\n",time(0),sender->sa_data[0],sender->sa_data[1],sender->sa_data[2],sender->sa_data[3],field,value);
if (i_f) fprintf(i_f,"%ld:%02x%02x%02x%02x:%d:%d\n",(long)time(0),sender->sa_data[0],sender->sa_data[1],sender->sa_data[2],sender->sa_data[3],field,value);
if (i_f) fflush(i_f);
}
}