Revert "isisd: When the ISIS types of the routers do not match on a P2P link" (#3)

zhou-run · web-flow · commit 11185561157e · 2024-06-20T13:50:55.000+08:00
This reverts commit 55e881e.
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
@@ -231,8 +231,7 @@ static int process_p2p_hello(struct iih_info *iih)
 			return ISIS_OK;
 		}
 	}
-	if (!adj || adj->level != iih->calculated_type ||
-	    !(iih->circuit->is_type & iih->circ_type)) {
+	if (!adj || adj->level != iih->calculated_type) {
 		if (!adj) {
 			adj = isis_new_adj(iih->sys_id, NULL,
 					   iih->calculated_type, iih->circuit);

Original file line number	Diff line number	Diff line change
`@@ -231,8 +231,7 @@ static int process_p2p_hello(struct iih_info *iih)`
`231`	`231`	`return ISIS_OK;`
`232`	`232`	`}`
`233`	`233`	`}`
`234`		`- if (!adj \|\| adj->level != iih->calculated_type \|\|`
`235`		`- !(iih->circuit->is_type & iih->circ_type)) {`
	`234`	`+ if (!adj \|\| adj->level != iih->calculated_type) {`
`236`	`235`	`if (!adj) {`
`237`	`236`	`adj = isis_new_adj(iih->sys_id, NULL,`
`238`	`237`	`iih->calculated_type, iih->circuit);`