sip/transp: remove HAVE_INET6

sreimers · sreimers · commit 31f1f46d09a8 · 2024-07-22T09:01:49.000+02:00
diff --git a/src/sip/transp.c b/src/sip/transp.c
@@ -1102,7 +1102,6 @@ static int ws_conn_send(struct sip_connqent **qentp, struct sip *sip,
 }
 
 
-#if HAVE_INET6
 static int dst_set_scopeid(struct sip *sip, struct sa *dst, enum sip_transp tp)
 {
 	struct sa laddr;
@@ -1118,7 +1117,6 @@ static int dst_set_scopeid(struct sip *sip, struct sa *dst, enum sip_transp tp)
 	sa_set_scopeid(dst, sa_scopeid(&laddr));
 	return 0;
 }
-#endif
 
 
 int sip_transp_init(struct sip *sip, uint32_t sz)
@@ -1446,11 +1444,9 @@ int sip_transp_send(struct sip_connqent **qentp, struct sip *sip, void *sock,
 		return EINVAL;
 
 	sa_cpy(&dsttmp, dst);
-#if HAVE_INET6
 	err = dst_set_scopeid(sip, &dsttmp, tp);
 	if (err)
 		return err;
-#endif
 
 	switch (tp) {
 

Original file line number	Diff line number	Diff line change
`@@ -1102,7 +1102,6 @@ static int ws_conn_send(struct sip_connqent *qentp, struct sip sip,`
`1102`	`1102`	`}`
`1103`	`1103`
`1104`	`1104`
`1105`		`-#if HAVE_INET6`
`1106`	`1105`	`static int dst_set_scopeid(struct sip sip, struct sa dst, enum sip_transp tp)`
`1107`	`1106`	`{`
`1108`	`1107`	`struct sa laddr;`
`@@ -1118,7 +1117,6 @@ static int dst_set_scopeid(struct sip sip, struct sa dst, enum sip_transp tp)`
`1118`	`1117`	`sa_set_scopeid(dst, sa_scopeid(&laddr));`
`1119`	`1118`	`return 0;`
`1120`	`1119`	`}`
`1121`		`-#endif`
`1122`	`1120`
`1123`	`1121`
`1124`	`1122`	`int sip_transp_init(struct sip *sip, uint32_t sz)`
`@@ -1446,11 +1444,9 @@ int sip_transp_send(struct sip_connqent *qentp, struct sip sip, void *sock,`
`1446`	`1444`	`return EINVAL;`
`1447`	`1445`
`1448`	`1446`	`sa_cpy(&dsttmp, dst);`
`1449`		`-#if HAVE_INET6`
`1450`	`1447`	`err = dst_set_scopeid(sip, &dsttmp, tp);`
`1451`	`1448`	`if (err)`
`1452`	`1449`	`return err;`
`1453`		`-#endif`
`1454`	`1450`
`1455`	`1451`	`switch (tp) {`
`1456`	`1452`