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/isakmp_inf.c
          +++ new/iked/ikev1/isakmp_inf.c
↓ open down ↓ 36 lines elided ↑ open up ↑
  37   37  
  38   38  #include <netinet/in.h>
  39   39  #include <sys/queue.h>
  40   40  
  41   41  #ifdef HAVE_NETINET6_IPSEC_H
  42   42  # include <netinet6/ipsec.h>
  43   43  #else
  44   44  # ifdef HAVE_NETIPSEC_IPSEC_H
  45   45  #  include <netipsec/ipsec.h>
  46   46  # else
  47      -#  include <linux/ipsec.h>
       47 +#  ifndef sun   /* XXX KEBE SAYS OpenSolaris */
       48 +#    include <linux/ipsec.h>
       49 +#  endif
  48   50  # endif
  49   51  #endif
  50   52  
  51   53  #include <stdlib.h>
  52   54  #include <stdio.h>
  53   55  #include <string.h>
  54   56  #include <errno.h>
  55   57  #if TIME_WITH_SYS_TIME
  56   58  # include <sys/time.h>
  57   59  # include <time.h>
↓ open down ↓ 821 lines elided ↑ open up ↑
 879  881                  /* XXX there is a potential of dos attack. */
 880  882                  if (msgid == 0) {
 881  883                          /* delete ph1 */
 882  884                          plog(PLOG_PROTOERR, PLOGLOC, 0,
 883  885                                  "delete phase1 handle.\n");
 884  886                          return -1;
 885  887                  } else {
 886  888                          iph2 = getph2bymsgid(iph1, msgid);
 887  889                          if (iph2 == NULL) {
 888  890                                  plog(PLOG_PROTOERR, PLOGLOC, 0,
 889      -                                        "unknown notify message, "
 890      -                                        "no phase2 handle found.\n");
      891 +                                    "unknown notify message (%d), "
      892 +                                    "no phase2 handle found.\n", type);
 891  893                          } else {
 892  894                                  /* delete ph2 */
 893  895                                  unbindph12(iph2);
 894  896                                  remph2(iph2);
 895  897                                  delph2(iph2);
 896  898                          }
 897  899                  }
 898  900              }
 899  901                  break;
 900  902          }
↓ open down ↓ 548 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX