summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhasso <hasso>2004-09-14 13:05:13 +0200
committerhasso <hasso>2004-09-14 13:05:13 +0200
commit64a7afd6de67eebda09a6766aa27dbd722539363 (patch)
tree484ef68fd5f186cb957852f136c8f5f1aeb364f6
parentDisable isisd compiling by default. It compiles only in Linux and FreeBSD (diff)
downloadfrr-64a7afd6de67eebda09a6766aa27dbd722539363.tar.xz
frr-64a7afd6de67eebda09a6766aa27dbd722539363.zip
isis_pdu.c: Update l1_desig_is only if neighbor really is DIS.
-rw-r--r--isisd/ChangeLog4
-rw-r--r--isisd/isis_pdu.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 33608b136..3fa9f98a4 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-14 LIU Xin <lx at ns.6test.edu.cn>
+
+ * isis_pdu.c: Update l1_desig_is only if neighbor really is DIS.
+
2004-09-10 LIU Xin <lx at ns.6test.edu.cn>
* isis_pdu.c: Goto out only if no adjacency exist.
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
index c7142eeac..1ecdab48c 100644
--- a/isisd/isis_pdu.c
+++ b/isisd/isis_pdu.c
@@ -839,16 +839,18 @@ process_lan_hello (int level, struct isis_circuit *circuit, u_char * ssnpa)
if (memcmp (circuit->u.bc.l1_desig_is, hdr.lan_id, ISIS_SYS_ID_LEN + 1))
{
thread_add_event (master, isis_event_dis_status_change, circuit, 0);
- memcpy (&circuit->u.bc.l1_desig_is, hdr.lan_id,
- ISIS_SYS_ID_LEN + 1);
+ if (adj->dis_record[level-1].dis == ISIS_IS_DIS)
+ memcpy (&circuit->u.bc.l1_desig_is, hdr.lan_id,
+ ISIS_SYS_ID_LEN + 1);
}
break;
case 2:
if (memcmp (circuit->u.bc.l2_desig_is, hdr.lan_id, ISIS_SYS_ID_LEN + 1))
{
thread_add_event (master, isis_event_dis_status_change, circuit, 0);
- memcpy (&circuit->u.bc.l2_desig_is, hdr.lan_id,
- ISIS_SYS_ID_LEN + 1);
+ if (adj->dis_record[level-1].dis == ISIS_IS_DIS)
+ memcpy (&circuit->u.bc.l2_desig_is, hdr.lan_id,
+ ISIS_SYS_ID_LEN + 1);
}
break;
}