Merge branch 'kj/epmd-port2resp-trunc-extra' into ccase/r13b04_dev

* kj/epmd-port2resp-trunc-extra:
  Handle "extra" field according to specs in ALIVE2_REQ and PORT2_RESP.

OTP-8361  EPMD now correctly handles the extra data field which can be
          given in the ALIVE2_REQ request and retrieved in the PORT2_RESP
          response. (Thanks to Klas Johansson.)

1 files changed, 6 insertions, 5 deletions

diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h
index b120b44579..65fcf9bacb 100644
--- a/erts/epmd/src/epmd_int.h
+++ b/erts/epmd/src/epmd_int.h
@@ -1,19 +1,19 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 1998-2010. All Rights Reserved.
+ *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
  * compliance with the License. You should have received a copy of the
  * Erlang Public License along with this software. If not, it can be
  * retrieved online at http://www.erlang.org/.
- * 
+ *
  * Software distributed under the License is distributed on an "AS IS"
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * %CopyrightEnd%
  */
 /* 
@@ -294,6 +294,7 @@ struct enode {
   char protocol;                /* 0 = tcp/ipv4 */
   unsigned short highvsn;       /* 0 = OTP-R3 erts-4.6.x, 1 = OTP-R4 erts-4.7.x*/
   unsigned short lowvsn;
+  int extralen;
   char extra[MAXSYMLEN+1];
 };