cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair readdress option.

Browse Source 
The actual functionality is untested, but without this patch,
ytalk just seg-faults as soon as readdress appears in a configuration
file.

Problem reported as random segfaults by todd@, nice common debugging
session :)
This commit is contained in:
espie 1999-03-17 02:10:32 +00:00
parent f608351ff1
commit bebf0a30b1
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/ytalk/patches/patch-ab Normal file
View File

@ -0,0 +1,27 @@
--- socket.c.orig Wed Mar 17 02:31:30 1999
+++ socket.c Wed Mar 17 02:36:50 1999
@@ -214,7 +214,8 @@
register readdr *r;
for(r = readdr_list; r != NULL; r = r->next)
- if((addr & r->mask) == r->addr)
+ if( ((r->from_addr & r->from_mask) == (me->host_addr & r->from_mask))
+ && ((addr & r->mask) == r->addr) )
{
addr = (r->id_addr & r->id_mask) |
(me->host_addr & (~(r->id_mask)));
@@ -951,12 +952,12 @@
to_mask = make_net_mask(to_addr);
on_mask = make_net_mask(on_addr);
- if((from_addr & from_mask) != (me->host_addr & from_mask))
- return;
if(from_addr == to_addr)
return;
new = (readdr *)get_mem(sizeof(readdr));
+ new->from_addr = from_addr;
+ new->from_mask = from_mask;
new->addr = on_addr;
new->mask = on_mask;
new->id_addr = to_addr;

11
net/ytalk/patches/patch-ac Normal file
View File

@ -0,0 +1,11 @@
--- socket.h.orig Wed Mar 17 02:32:04 1999
+++ socket.h Wed Mar 17 02:33:03 1999
@@ -24,6 +24,8 @@
typedef struct _readdr {
struct _readdr *next; /* next in linked list */
+ ylong from_addr; /* does this apply to me ? */
+ ylong from_mask;
ylong addr; /* this net address [group?], */
ylong mask; /* with this mask, */
ylong id_addr; /* thinks I'm at this net address, */