fun/gosl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://bitsetter.de:8090/netsl

Browse Source
This commit is contained in:
tkarrass 2013-11-03 13:38:28 +01:00
commit 9cf94bbcbb
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/net.c
View File

@ -17,16 +17,19 @@
#include "net.h"
// kleiner helfer
// auch von bejee geguttenbergt
//
void *get_in_addr(struct sockaddr *sa)
{
if (sa->sa_family == AF_INET) {
// little helper
static void *get_in_addr(struct sockaddr *sa) {
switch (sa->sa_family) {
case AF_INET:
return &(((struct sockaddr_in*)sa)->sin_addr);
}
break;
case AF_INET6:
return &(((struct sockaddr_in6*)sa)->sin6_addr);
break;
case AF_UNSPEC:
default:
return NULL;
}
}
@ -49,7 +52,7 @@ int run_server(const struct prog_info *pinfo, char *img, int w, int h) {
return 1;
}
for(p = servinfo; p != NULL; p = p->ai_next) {
for (p = servinfo; p != NULL; p = p->ai_next) {
if ((sockfd = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
perror("talker: socket");
continue;

1
src/net.h
View File

@ -6,7 +6,6 @@
#include "msg.h" // message serialization
#include "display.h" // callback
void *get_in_addr(struct sockaddr *sa);
int run_server(const struct prog_info *pinfo, char *img, int w, int h);
int run_client(const struct prog_info *pinfo,void(*framecallback)(const struct message *, const struct prog_info *));