48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#897 Do not use socket type in ogAdmServer 

No need for an extra type, socket descriptors are always integer.
master
OpenGnSys Support Team 2019-02-06 14:32:54 +01:00
parent 2baf362ac2
commit b38ed0dfb8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sources/ogAdmServer.cpp
View File

@ -1434,7 +1434,7 @@ bool Levanta(char *iph, char *mac, char *mar)
unsigned int on = 1; unsigned int on = 1;
sockaddr_in local; sockaddr_in local;
int i, lon, res; int i, lon, res;
SOCKET s; int s;
/* Creación de socket para envío de magig packet */ /* Creación de socket para envío de magig packet */
s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@ -1456,7 +1456,7 @@ bool Levanta(char *iph, char *mac, char *mar)
lon = splitCadena(ptrIP, iph, ';'); lon = splitCadena(ptrIP, iph, ';');
lon = splitCadena(ptrMacs, mac, ';'); lon = splitCadena(ptrMacs, mac, ';');
for (i = 0; i < lon; i++) { for (i = 0; i < lon; i++) {
if (!WakeUp(&s,ptrIP[i],ptrMacs[i],mar)) { if (!WakeUp(s, ptrIP[i], ptrMacs[i], mar)) {
syslog(LOG_ERR, "problem sending magic packet\n"); syslog(LOG_ERR, "problem sending magic packet\n");
close(s); close(s);
return false; return false;
@ -1550,7 +1550,7 @@ enum wol_delivery_type {
// false: En caso de ocurrir algún error // false: En caso de ocurrir algún error
//_____________________________________________________________________________________________________________ //_____________________________________________________________________________________________________________
// //
bool WakeUp(SOCKET *s, char* iph, char *mac, char *mar) bool WakeUp(int s, char* iph, char *mac, char *mar)
{ {
char HDaddress_bin[OG_WOL_MACADDR_LEN]; char HDaddress_bin[OG_WOL_MACADDR_LEN];
struct sockaddr_in WakeUpCliente; struct sockaddr_in WakeUpCliente;
@ -1579,7 +1579,7 @@ bool WakeUp(SOCKET *s, char* iph, char *mac, char *mar)
switch (atoi(mar)) { switch (atoi(mar)) {
case OG_WOL_BROADCAST: case OG_WOL_BROADCAST:
ret = wake_up_broadcast(*s, &WakeUpCliente, &Trama_WakeUp); ret = wake_up_broadcast(s, &WakeUpCliente, &Trama_WakeUp);
break; break;
case OG_WOL_UNICAST: case OG_WOL_UNICAST:
if (inet_aton(iph, &addr) < 0) { if (inet_aton(iph, &addr) < 0) {
@ -1587,7 +1587,7 @@ bool WakeUp(SOCKET *s, char* iph, char *mac, char *mar)
ret = false; ret = false;
break; break;
} }
ret = wake_up_unicast(*s, &WakeUpCliente, &Trama_WakeUp, &addr); ret = wake_up_unicast(s, &WakeUpCliente, &Trama_WakeUp, &addr);
break; break;
default: default:
syslog(LOG_ERR, "unknown wol type\n"); syslog(LOG_ERR, "unknown wol type\n");

2
sources/ogAdmServer.h
View File

@ -47,7 +47,7 @@ bool buscaComandos(char *,TRAMA *,int *);
bool respuestaConsola(int socket, TRAMA *,int); bool respuestaConsola(int socket, TRAMA *,int);
bool enviaComando(TRAMA *ptrTrama,const char*); bool enviaComando(TRAMA *ptrTrama,const char*);
bool Levanta(char*,char*,char*); bool Levanta(char*,char*,char*);
bool WakeUp(SOCKET *,char*,char*,char*); bool WakeUp(int,char*,char*,char*);
void PasaHexBin(char *,char *); void PasaHexBin(char *,char *);
bool actualizaCreacionImagen(Database,Table,char*,char*,char*,char*,char*,char*); bool actualizaCreacionImagen(Database,Table,char*,char*,char*,char*,char*,char*);
bool actualizaRestauracionImagen(Database,Table,char*,char*,char*,char*,char*); bool actualizaRestauracionImagen(Database,Table,char*,char*,char*,char*,char*);