Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-21 14:50:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix http server spurious close syscall

Browse Source
This commit is contained in:
pancake 2012-12-12 04:10:44 +01:00
parent c98cc9d1ab
commit c8de9fe3a7
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/rtr.c
View File

@ -140,7 +140,7 @@ R_API int r_core_rtr_http(RCore *core, int launch) {
} else {
r_socket_http_response (rs, 404, "Invalid protocol", 0, NULL);
}
r_socket_http_close_later (rs);
r_socket_http_close (rs);
}
r_socket_free (s);
r_cons_break_end ();

24
libr/socket/socket.c
View File

@ -4,6 +4,7 @@
#include <r_types.h>
#include <r_socket.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <signal.h>
#include <stdio.h>
@ -216,7 +217,7 @@ R_API int r_socket_close (RSocket *s) {
WSACleanup ();
ret = closesocket (s->fd);
#else
//shutdown (s->fd, SHUT_RDWR);
shutdown (s->fd, SHUT_RDWR);
ret = close (s->fd);
#endif
}
@ -236,9 +237,11 @@ R_API int r_socket_close_later (RSocket *s) {
r_socket_close (s);
exit (0);
}
return 0;
#else
r_socket_close (s);
return r_socket_close (s);
#endif
return R_TRUE;
}
R_API int r_socket_free (RSocket *s) {
@ -265,7 +268,11 @@ R_API int r_socket_listen (RSocket *s, const char *port, const char *certfile) {
linger.l_onoff = 1;
linger.l_linger = 1;
setsockopt (s->fd, SOL_SOCKET, SO_LINGER, (const char *)&linger, sizeof (linger));
setsockopt(s->fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval);
{ // fix close after write bug //
int x = 1500;
setsockopt (s->fd, SOL_SOCKET, SO_SNDBUF, (const char *)&x, sizeof (int));
}
setsockopt (s->fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval);
memset (&sa, 0, sizeof (sa));
sa.sin_family = AF_INET;
sa.sin_addr.s_addr = htonl (s->local? INADDR_LOOPBACK: INADDR_ANY);
@ -308,13 +315,13 @@ R_API RSocket *r_socket_accept(RSocket *s) {
if (!s) return NULL;
sock = R_NEW (RSocket);
if (!sock) return NULL;
sock->is_ssl = s->is_ssl;
sock->fd = accept (s->fd, NULL, NULL);
if (sock->fd == -1) {
free (sock);
return NULL;
}
#if HAVE_LIB_SSL
sock->is_ssl = s->is_ssl;
if (sock->is_ssl) {
sock->sfd = NULL;
sock->ctx = NULL;
@ -331,6 +338,8 @@ R_API RSocket *r_socket_accept(RSocket *s) {
BIO_set_ssl (sbio, sock->sfd, BIO_CLOSE);
BIO_push (sock->bio, sbio);
}
#else
sock->is_ssl = 0;
#endif
return sock;
}
@ -421,8 +430,11 @@ R_API char *r_socket_to_string(RSocket *s) {
/* Read/Write functions */
R_API int r_socket_write(RSocket *s, void *buf, int len) {
int ret, delta = 0;
#if __UNIX__
signal (SIGPIPE, SIG_IGN);
#endif
for (;;) {
int b = 65536; // Use MTU 1500?
int b = len ; //65536; // Use MTU 1500?
if (b>len) b = len;
#if HAVE_LIB_SSL
if (s->is_ssl)
@ -432,7 +444,7 @@ R_API int r_socket_write(RSocket *s, void *buf, int len) {
ret = SSL_write (s->sfd, buf+delta, b);
else
#endif
ret = send (s->fd, buf+delta, len, MSG_NOSIGNAL);
ret = send (s->fd, buf+delta, len, 0);
//if (ret == 0) return -1;
if (!ret) continue;
if (ret == len)

7
shlr/java/code.c
View File

@ -28,8 +28,11 @@ static struct cp_item * get_cp(int i) {
static int java_resolve(int idx, char *str) {
if (str == NULL)
return 0;
str[0]='\0';
sprintf (str, "(%d)", idx);
// eprintf ("
if (cf.cp_count<1) {
/* load constant pool here */
}
if (idx<0||idx>cf.cp_count)
return 1;
if (cp_items) {