projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fixes.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
e818b0b
..
e6e76d3
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: meta.c,v 1.1.2.
37 2003/07/22 20:55:19
guus Exp $
+ $Id: meta.c,v 1.1.2.
41 2003/08/12 14:48:12
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-27,14
+27,15
@@
#include "avl_tree.h"
#include "connection.h"
#include "logger.h"
#include "avl_tree.h"
#include "connection.h"
#include "logger.h"
+#include "meta.h"
#include "net.h"
#include "protocol.h"
#include "system.h"
#include "utils.h"
#include "net.h"
#include "protocol.h"
#include "system.h"
#include "utils.h"
-bool send_meta(connection_t *c, char *buffer, int length)
+bool send_meta(connection_t *c, c
onst c
har *buffer, int length)
{
{
- char *bufp;
+ c
onst c
har *bufp;
int outlen;
char outbuf[MAXBUFSIZE];
int result;
int outlen;
char outbuf[MAXBUFSIZE];
int result;
@@
-52,12
+53,16
@@
bool send_meta(connection_t *c, char *buffer, int length)
bufp = buffer;
while(length) {
bufp = buffer;
while(length) {
- result =
write(c->socket, bufp, length
);
+ result =
send(c->socket, bufp, length, 0
);
if(result <= 0) {
if(result <= 0) {
- if(errno == EINTR)
+ if(!errno || errno == EPIPE) {
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
+ c->name, c->hostname);
+ } else if(errno == EINTR)
continue;
continue;
- logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
- c->hostname, strerror(errno));
+ else
+ logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+ c->hostname, strerror(errno));
return false;
}
bufp += result;
return false;
}
bufp += result;
@@
-67,7
+72,7
@@
bool send_meta(connection_t *c, char *buffer, int length)
return true;
}
return true;
}
-void broadcast_meta(connection_t *from, char *buffer, int length)
+void broadcast_meta(connection_t *from, c
onst c
har *buffer, int length)
{
avl_node_t *node;
connection_t *c;
{
avl_node_t *node;
connection_t *c;
@@
-114,10
+119,10
@@
bool receive_meta(connection_t *c)
- If not, keep stuff in buffer and exit.
*/
- If not, keep stuff in buffer and exit.
*/
- lenin = re
ad(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen
);
+ lenin = re
cv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0
);
if(lenin <= 0) {
if(lenin <= 0) {
- if(
lenin == 0
) {
+ if(
!lenin || !errno
) {
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR)
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR)