real_packet_t rp;
cp
do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
- rp.from = myself->vpn_ip;
+ rp.from = htonl(myself->vpn_ip);
+ rp.data.len = htons(rp.data.len);
+ rp.len = htons(rp.len);
if(debug_lvl > 3)
- syslog(LOG_ERR, "Sent %d bytes to %lx", rp.len, cl->vpn_ip);
+ syslog(LOG_ERR, "Sent %d bytes to %lx", ntohs(rp.len), cl->vpn_ip);
- if((r = send(cl->socket, (char*)&rp, rp.len, 0)) < 0)
+ if((r = send(cl->socket, (char*)&rp, ntohs(rp.len), 0)) < 0)
{
syslog(LOG_ERR, "Error sending data: %m");
return -1;
*/
int send_packet(ip_t to, vpn_packet_t *packet)
{
+ config_t const *cfg;
conn_list_t *cl;
cp
+ if(!(cfg = get_config_val(proxymode))) /* In case we are in proxy mode, just send everything to our uplink. */
+ cl = conn_list;
+ else
+ cl = lookup_conn(to);
+
if((cl = lookup_conn(to)) == NULL)
{
if(debug_lvl > 2)
return -1;
}
total_socket_in += lenin;
+
+ rp.data.len = ntohs(rp.data.len);
+ rp.len = ntohs(rp.len);
+ rp.from = ntohl(rp.from);
+
if(rp.len >= 0)
{
f = lookup_conn(rp.from);
int handle_incoming_meta_data(conn_list_t *cl)
{
int x, l = sizeof(x);
- int request, oldlen, p, i;
+ int request, oldlen, i;
int lenin = 0;
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
for(;;)
{
- p=0;
+ cl->reqlen = 0;
for(i = oldlen; i < cl->buflen; i++)
{
if(cl->buffer[i] == '\n')
{
- p = i + 1;
- cl->buffer[p] = 0; /* add end-of-string so we can use sscanf */
+ cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */
+ cl->reqlen = i + 1;
break;
}
}
- if(p)
+ if(cl->reqlen)
{
if(sscanf(cl->buffer, "%d", &request) == 1)
{
syslog(LOG_ERR, "Bogus data received: %s", cl->buffer);
}
- cl->buflen -= p;
- memmove(cl->buffer, cl->buffer + p, cl->buflen);
+ cl->buflen -= cl->reqlen;
+ memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
oldlen = 0;
}
else