Browse Source

change close() to closesocket() on sockets (compatible with libavformat)

Originally committed as revision 8068 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Alex Beregszaszi 18 years ago
parent
commit
d96633bbe4
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      ffserver.c

+ 4
- 4
ffserver.c View File

@@ -436,13 +436,13 @@ static int socket_open_listen(struct sockaddr_in *my_addr)
char bindmsg[32]; char bindmsg[32];
snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port)); snprintf(bindmsg, sizeof(bindmsg), "bind(port %d)", ntohs(my_addr->sin_port));
perror (bindmsg); perror (bindmsg);
close(server_fd);
closesocket(server_fd);
return -1; return -1;
} }


if (listen (server_fd, 5) < 0) { if (listen (server_fd, 5) < 0) {
perror ("listen"); perror ("listen");
close(server_fd);
closesocket(server_fd);
return -1; return -1;
} }
fcntl(server_fd, F_SETFL, O_NONBLOCK); fcntl(server_fd, F_SETFL, O_NONBLOCK);
@@ -686,7 +686,7 @@ static void new_connection(int server_fd, int is_rtsp)
av_free(c->buffer); av_free(c->buffer);
av_free(c); av_free(c);
} }
close(fd);
closesocket(fd);
} }


static void close_connection(HTTPContext *c) static void close_connection(HTTPContext *c)
@@ -716,7 +716,7 @@ static void close_connection(HTTPContext *c)


/* remove connection associated resources */ /* remove connection associated resources */
if (c->fd >= 0) if (c->fd >= 0)
close(c->fd);
closesocket(c->fd);
if (c->fmt_in) { if (c->fmt_in) {
/* close each frame parser */ /* close each frame parser */
for(i=0;i<c->fmt_in->nb_streams;i++) { for(i=0;i<c->fmt_in->nb_streams;i++) {


Loading…
Cancel
Save