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.5 2000/10/21 11:52:06 guus Exp $
+ $Id: meta.c,v 1.1.2.11 2000/11/15 13:33:25 guus Exp $
*/
#include "config.h"
#include <errno.h>
#include <syslog.h>
#include <sys/signal.h>
+#include <unistd.h>
+#include <string.h>
+/* This line must be below the rest for FreeBSD */
#include <sys/socket.h>
-#include <openssl/evp.h>
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
#include "net.h"
#include "system.h"
+#include "protocol.h"
int send_meta(conn_list_t *cl, char *buffer, int length)
{
cl->name, cl->hostname, buffer);
buffer[length-1]='\n';
-
+
if(cl->status.encryptout)
{
EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
bufp = outbuf;
+ length = outlen;
}
else
- bufp = buffer;
+ bufp = buffer;
if(write(cl->meta_socket, bufp, length) < 0)
{
if(cl->status.decryptin)
{
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin);
+ EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
}
-
+
oldlen = cl->buflen;
cl->buflen += lenin;
if(cl->reqlen)
{
- if(debug_lvl >= DEBUG_PROTOCOL)
+ if(debug_lvl >= DEBUG_META)
syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
cl->name, cl->hostname, cl->buffer);
}
cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
cp
return 0;
}