Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 364479 | Differences between
and this patch

Collapse All | Expand All

(-)src/spacecomm.c.old (-5 / +18 lines)
Lines 74-79 Link Here
74
    
74
    
75
   */
75
   */
76
76
77
  struct hostent* he;
78
77
  int sfd,nsfd;
79
  int sfd,nsfd;
78
  struct sockaddr_in ser_addr,cli_addr;
80
  struct sockaddr_in ser_addr,cli_addr;
79
  int cli_addr_len;
81
  int cli_addr_len;
Lines 134-140 Link Here
134
136
135
  switch(mode){
137
  switch(mode){
136
  case 0:/* server */
138
  case 0:/* server */
137
139
    //  **** Resolving Hostname **********************
140
    if ((he = gethostbyname(par.IP)) == NULL){
141
        perror("gethostbyname");
142
        exit(-1);
143
    }
144
    // ************************************************
138
    printf("Waiting for player ...\n");
145
    printf("Waiting for player ...\n");
139
    /* Apertura de un conector del tipo STREAM de la familia AF_INET */
146
    /* Apertura de un conector del tipo STREAM de la familia AF_INET */
140
    if ((sfd=socket(PF_INET,SOCK_STREAM,0)) == -1){
147
    if ((sfd=socket(PF_INET,SOCK_STREAM,0)) == -1){
Lines 145-151 Link Here
145
    /* Publicidad de la direccion del servidor */
152
    /* Publicidad de la direccion del servidor */
146
 
153
 
147
    ser_addr.sin_family = AF_INET;
154
    ser_addr.sin_family = AF_INET;
148
    ser_addr.sin_addr.s_addr= inet_addr(par.IP);
155
    ser_addr.sin_addr= *((struct in_addr *)he->h_addr);
149
    ser_addr.sin_port = htons ( par.port);
156
    ser_addr.sin_port = htons ( par.port);
150
    
157
    
151
    printf("waiting conexion %s:%d\n",par.IP,par.port);
158
    printf("waiting conexion %s:%d\n",par.IP,par.port);
Lines 171-177 Link Here
171
    /* Publicidad de la direccion del servidor */
178
    /* Publicidad de la direccion del servidor */
172
 
179
 
173
    ser_addr2.sin_family = AF_INET;
180
    ser_addr2.sin_family = AF_INET;
174
    ser_addr2.sin_addr.s_addr= inet_addr(par.IP);
181
    ser_addr2.sin_addr= *((struct in_addr *)he->h_addr);
175
    ser_addr2.sin_port = htons ( par.port2);
182
    ser_addr2.sin_port = htons ( par.port2);
176
    
183
    
177
    if(bind(sfd2,(struct sockaddr *)&ser_addr2,sizeof(ser_addr)) == -1){
184
    if(bind(sfd2,(struct sockaddr *)&ser_addr2,sizeof(ser_addr)) == -1){
Lines 201-206 Link Here
201
208
202
    break;
209
    break;
203
  case 1: /* client */
210
  case 1: /* client */
211
    //  **** Resolving Hostname **********************
212
    if ((he = gethostbyname(par.IP)) == NULL){
213
        perror("gethostbyname");
214
        exit(-1);
215
    }
216
    // ************************************************
204
    printf("Connecting with server: %s:%d\n",par.IP,par.port);
217
    printf("Connecting with server: %s:%d\n",par.IP,par.port);
205
218
206
    /* Apertura de un conector del tipo STREAM de la familia AF_INET */
219
    /* Apertura de un conector del tipo STREAM de la familia AF_INET */
Lines 211-217 Link Here
211
    
224
    
212
    /* Peticion de conexion con el servidor */
225
    /* Peticion de conexion con el servidor */
213
    ser_addr.sin_family = AF_INET;
226
    ser_addr.sin_family = AF_INET;
214
    ser_addr.sin_addr.s_addr= inet_addr(par.IP);
227
    ser_addr.sin_addr= *((struct in_addr *)he->h_addr);
215
    ser_addr.sin_port = htons ( par.port);
228
    ser_addr.sin_port = htons ( par.port);
216
    if(connect(sfd,(struct sockaddr *)&ser_addr,sizeof(ser_addr)) == -1){
229
    if(connect(sfd,(struct sockaddr *)&ser_addr,sizeof(ser_addr)) == -1){
217
      perror("conexion:");
230
      perror("conexion:");
Lines 229-235 Link Here
229
    
242
    
230
    /* Peticion de conexion con el servidor */
243
    /* Peticion de conexion con el servidor */
231
    ser_addr2.sin_family = AF_INET;
244
    ser_addr2.sin_family = AF_INET;
232
    ser_addr2.sin_addr.s_addr= inet_addr(par.IP);
245
    ser_addr2.sin_addr= *((struct in_addr *)he->h_addr);
233
    ser_addr2.sin_port = htons ( par.port2);
246
    ser_addr2.sin_port = htons ( par.port2);
234
    if(connect(sfd2,(struct sockaddr *)&ser_addr2,sizeof(ser_addr2)) == -1){
247
    if(connect(sfd2,(struct sockaddr *)&ser_addr2,sizeof(ser_addr2)) == -1){
235
      perror("conexion");
248
      perror("conexion");
(-)include/spacecomm.h.old (+1 lines)
Lines 32-37 Link Here
32
#include <fcntl.h>
32
#include <fcntl.h>
33
#include <sys/socket.h>
33
#include <sys/socket.h>
34
#include <netinet/in.h>
34
#include <netinet/in.h>
35
#include <netdb.h>
35
#include <arpa/inet.h>
36
#include <arpa/inet.h>
36
#include <pthread.h>
37
#include <pthread.h>
37
#include <semaphore.h>
38
#include <semaphore.h>

Return to bug 364479