Print this page
First attempt at further IPsec cluster cleanup
@@ -1566,33 +1566,10 @@
* Set global to indicate we prefer an extended ACQUIRE.
*/
atomic_inc_32(&keystack->keystack_num_extended);
}
-static void
-keysock_delpair_all(keysock_t *ks, mblk_t *mp, sadb_ext_t *extv[])
-{
- int i, start, finish;
- mblk_t *mp1 = NULL;
- keysock_stack_t *keystack = ks->keysock_keystack;
-
- start = 0;
- finish = KEYSOCK_MAX_CONSUMERS - 1;
-
- for (i = start; i <= finish; i++) {
- if (keystack->keystack_consumers[i] != NULL) {
- mp1 = copymsg(mp);
- if (mp1 == NULL) {
- keysock_error(ks, mp, ENOMEM,
- SADB_X_DIAGNOSTIC_NONE);
- return;
- }
- keysock_passdown(ks, mp1, i, extv, B_FALSE);
- }
- }
-}
-
/*
* Handle PF_KEY messages.
*/
static void
keysock_parse(queue_t *q, mblk_t *mp)
@@ -1710,18 +1687,10 @@
keysock_passdown(ks, mp, samsg->sadb_msg_satype, extv,
B_FALSE);
else keysock_error(ks, mp, EINVAL,
SADB_X_DIAGNOSTIC_SATYPE_NEEDED);
return;
- case SADB_X_DELPAIR_STATE:
- if (samsg->sadb_msg_satype == SADB_SATYPE_UNSPEC) {
- keysock_delpair_all(ks, mp, extv);
- } else {
- keysock_passdown(ks, mp, samsg->sadb_msg_satype, extv,
- B_FALSE);
- }
- return;
case SADB_ACQUIRE:
/*
* If I _receive_ an acquire, this means I should spread it
* out to registered sockets. Unless there's an errno...
*
@@ -1772,10 +1741,11 @@
*
* XXX for now this is unsupported.
*/
break;
case SADB_FLUSH:
+ case SADB_DUMP: /* not used by normal applications */
/*
* Nuke all SAs.
*
* No extensions at all. Return to all listeners.
*
@@ -1794,21 +1764,10 @@
}
/* Passing down of DUMP/FLUSH messages are special. */
qwriter(q, mp, keysock_do_flushdump, PERIM_INNER);
return;
- case SADB_DUMP: /* not used by normal applications */
- if ((extv[0] != NULL) &&
- ((msgsize >
- (sizeof (sadb_msg_t) + sizeof (sadb_x_edump_t))) ||
- (extv[SADB_X_EXT_EDUMP] == NULL))) {
- keysock_error(ks, mp, EINVAL,
- SADB_X_DIAGNOSTIC_NO_EXT);
- return;
- }
- qwriter(q, mp, keysock_do_flushdump, PERIM_INNER);
- return;
case SADB_X_PROMISC:
/*
* Promiscuous processing message.
*/
if (samsg->sadb_msg_satype == 0)