diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-09-22 10:09:20 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-09-22 10:09:20 +0000 |
| commit | cf3426389dbea6b5b143dc166c3072dc87807d6d (patch) | |
| tree | 926dadb7223fb547a5b56b917f110a12e8d9f092 /sys | |
| parent | 75cea71333d6bf7312579747c8493dbc2560a1b7 (diff) | |
Use the radix-tree API instead of function pointers.
ok yasuoka@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pipex.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/net/pipex.c b/sys/net/pipex.c index 38953e079f6..101be26e5ce 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.80 2015/09/13 17:53:44 mpi Exp $ */ +/* $OpenBSD: pipex.c,v 1.81 2015/09/22 10:09:19 mpi Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -446,8 +446,8 @@ pipex_add_session(struct pipex_session_req *req, return (EADDRINUSE); } - rn = pipex_rd_head4.rnh_addaddr(&session->ip_address, - &session->ip_netmask, &pipex_rd_head4, session->ps4_rn, RTP_STATIC); + rn = rn_addroute(&session->ip_address, &session->ip_netmask, + &pipex_rd_head4, session->ps4_rn, RTP_STATIC); if (rn == NULL) { splx(s); pool_put(&pipex_session_pool, session); @@ -455,9 +455,8 @@ pipex_add_session(struct pipex_session_req *req, } } if (0) { /* NOT YET */ - rn = pipex_rd_head6.rnh_addaddr(&session->ip6_address, - &session->ip6_prefixlen, &pipex_rd_head6, session->ps6_rn, - RTP_STATIC); + rn = rn_addroute(&session->ip6_address, &session->ip6_prefixlen, + &pipex_rd_head6, session->ps6_rn, RTP_STATIC); if (rn == NULL) { splx(s); pool_put(&pipex_session_pool, session); @@ -614,9 +613,8 @@ pipex_destroy_session(struct pipex_session *session) s = splnet(); if (!in_nullhost(session->ip_address.sin_addr)) { - rn = pipex_rd_head4.rnh_deladdr(&session->ip_address, - &session->ip_netmask, &pipex_rd_head4, - (struct radix_node *)session); + rn = rn_delete(&session->ip_address, &session->ip_netmask, + &pipex_rd_head4, (struct radix_node *)session); KASSERT(rn != NULL); } @@ -661,8 +659,8 @@ pipex_lookup_by_ip_address(struct in_addr addr) pipex_in4mask.sin_family = AF_INET; pipex_in4mask.sin_len = sizeof(pipex_in4mask); - session = (struct pipex_session *)pipex_rd_head4.rnh_lookup( - &pipex_in4, &pipex_in4mask, &pipex_rd_head4); + session = (struct pipex_session *)rn_lookup(&pipex_in4, &pipex_in4mask, + &pipex_rd_head4); #ifdef PIPEX_DEBUG if (session == NULL) { |