Print this page
Current snapshot of OpenSolaris port.
Checkpoint
Checkpoint
Merge from parent.
Merge with WIDE update.
Pull from WIDE.
Pull from WIDE.
Checkpoint
Re-update.
blah
WIDE update
Update from WIDE.

Split Close
Expand all
Collapse all
          --- old/iked/ikev1/handler.c
          +++ new/iked/ikev1/handler.c
↓ open down ↓ 267 lines elided ↑ open up ↑
 268  268  {
 269  269          if (iph1 == NULL)
 270  270                  return;
 271  271  
 272  272          /* SA down shell script hook */
 273  273          ikev1_script_hook(iph1, SCRIPT_PHASE1_DOWN);
 274  274  
 275  275          EVT_PUSH(iph1->local, iph1->remote, EVTT_PHASE1_DOWN, NULL);
 276  276  
 277  277  #ifdef ENABLE_NATT
      278 +#ifndef sun     /* XXX KEBE SAYS kernel does this in OpenSolaris */
 278  279          if (iph1->natt_flags & NAT_KA_QUEUED)
 279  280                  natt_keepalive_remove (iph1->local, iph1->remote);
      281 +#endif
 280  282  
 281  283          if (iph1->natt_options) {
 282  284                  racoon_free(iph1->natt_options);
 283  285                  iph1->natt_options = NULL;
 284  286          }
 285  287  #endif
 286  288  
 287  289          if (iph1->dpd_r_u != NULL)
 288  290                  SCHED_KILL(iph1->dpd_r_u);
 289  291  
↓ open down ↓ 173 lines elided ↑ open up ↑
 463  465  
 464  466          return NULL;
 465  467  }
 466  468  
 467  469  struct ph2handle *
 468  470  getph2byselector(struct sockaddr *src, struct sockaddr *dst, struct rcf_selector *selector)
 469  471  {
 470  472          struct ph2handle *p;
 471  473  
 472  474          LIST_FOREACH(p, &ph2tree, chain) {
      475 +#ifdef sun
      476 +                if ((p->selector->sl_index == selector->sl_index ||
      477 +                    rc_vmemcmp(p->selector->sl_index,
      478 +                        selector->sl_index) == 0) &&
      479 +#else
 473  480                  if (rc_vmemcmp(p->selector->sl_index, selector->sl_index)
 474  481                          == 0 &&
      482 +#endif
 475  483                      CMPSADDR(src, p->src) == 0 &&
 476  484                      CMPSADDR(dst, p->dst) == 0)
 477  485                          return p;
 478  486          }
 479  487  
 480  488          return NULL;
 481  489  }
 482  490  
 483  491  struct ph2handle *
 484  492  getph2bysaddr(struct sockaddr *src, struct sockaddr *dst)
↓ open down ↓ 137 lines elided ↑ open up ↑
 622  630                  iph2->dst = NULL;
 623  631          }
 624  632          if (iph2->src_id) {
 625  633                racoon_free(iph2->src_id);
 626  634                iph2->src_id = NULL;
 627  635          }
 628  636          if (iph2->dst_id) {
 629  637                racoon_free(iph2->dst_id);
 630  638                iph2->dst_id = NULL;
 631  639          }
      640 +#ifdef ENABLE_NATT
      641 +        if (iph2->natoa_src) {
      642 +                racoon_free(iph2->natoa_src);
      643 +                iph2->natoa_src = NULL;
      644 +        }
      645 +        if (iph2->natoa_dst) {
      646 +                racoon_free(iph2->natoa_dst);
      647 +                iph2->natoa_dst = NULL;
      648 +        }
      649 +#endif
 632  650  
 633  651          if (iph2->proposal) {
 634  652                  flushsaprop(iph2->proposal);
 635  653                  iph2->proposal = NULL;
 636  654          }
 637  655  
 638  656          sadb_request_finish(&iph2->sadb_request);
 639  657  
 640  658          racoon_free(iph2);
 641  659  }
↓ open down ↓ 839 lines elided ↑ open up ↑
1481 1499  
1482 1500  static int
1483 1501  delete_ipsec_sa(struct sadb_request *r, 
1484 1502                  struct sockaddr *src, struct sockaddr *dst, int proto, 
1485 1503                  uint32_t spi/* network order */)
1486 1504  {
1487 1505          struct rcpfk_msg param;
1488 1506          int satype;
1489 1507          int retval;
1490 1508  
     1509 +        (void) memset(&param, 0, sizeof (param));
     1510 +
1491 1511          switch (proto) {
1492 1512          case IPSECDOI_PROTO_IPSEC_AH:
1493 1513                  satype = RCT_SATYPE_AH;
1494 1514                  break;
1495 1515          case IPSECDOI_PROTO_IPSEC_ESP:
1496 1516                  satype = RCT_SATYPE_ESP;
1497 1517                  break;
1498 1518          case IPSECDOI_PROTO_IPCOMP:
1499 1519                  satype = RCT_SATYPE_IPCOMP;
1500 1520                  break;
↓ open down ↓ 104 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX