Re: [PATCH 4/4][SCTP]: Change adaption - adaptation as per the latest API draft.
On Wed, 2006-12-13 at 18:03 -0800, David Miller wrote: From: Sridhar Samudrala [EMAIL PROTECTED] Date: Wed, 13 Dec 2006 17:38:52 -0800 These parameters are not used by user-space apps. They define the parameters used by the protocol in SCTP headers that go on wire. There is no __KERNEL__ ifdef protection for these defines, and the linux/sctp.h header is exported to userspace via include/linux/Kbuild, therefore the interface is exposed to userspace and you cannot break it. I didn't know that all the files under include/linux are exported to userspace. AFAIK, i don't think there are any SCTP apps that use this file. But if you say that we shouldn't remove any of the APIs in linux/sctp.h, i am OK with keeping the existing ones and adding new ones with the changed name. Now that 2.6.20-rc1 is out, should i wait until 2.6.21 tree to open for re-submission or is there a window still open for 2.6.20? Thanks Sridhar - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/4][SCTP]: Change adaption - adaptation as per the latest API draft.
From: Sridhar Samudrala [EMAIL PROTECTED] Date: Thu, 14 Dec 2006 14:22:16 -0800 On Wed, 2006-12-13 at 18:03 -0800, David Miller wrote: From: Sridhar Samudrala [EMAIL PROTECTED] Date: Wed, 13 Dec 2006 17:38:52 -0800 These parameters are not used by user-space apps. They define the parameters used by the protocol in SCTP headers that go on wire. There is no __KERNEL__ ifdef protection for these defines, and the linux/sctp.h header is exported to userspace via include/linux/Kbuild, therefore the interface is exposed to userspace and you cannot break it. I didn't know that all the files under include/linux are exported to userspace. Not all of them, only select ones specified in the Kbuild file. If these structures and defines are meant for kernel-only, or only partially so, you should either annotate linux/sctp.h with appropriate __KERNEL__ ifdefs, or remove the header file from include/linux/Kbuild You cannot remove the file from Kbuild if it somehow is required by your SCTP user.h header file, for example. - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/4][SCTP]: Change adaption - adaptation as per the latest API draft.
[SCTP]: Change adaption - adaptation as per the latest API draft.
Signed-off-by: Ivan Skytte Jorgensen [EMAIL PROTECTED]
Signed-off-by: Sridhar Samudrala [EMAIL PROTECTED]
---
include/linux/sctp.h| 10 +-
include/net/sctp/structs.h |8
include/net/sctp/ulpevent.h |2 +-
include/net/sctp/user.h | 28 ++--
net/sctp/sm_make_chunk.c| 24
net/sctp/sm_statefuns.c | 32
net/sctp/socket.c | 34 +-
net/sctp/ulpevent.c | 20 ++--
8 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 35108fe..d4f8656 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -180,7 +180,7 @@ typedef enum {
SCTP_PARAM_ERR_CAUSE= __constant_htons(0xc003),
SCTP_PARAM_SET_PRIMARY = __constant_htons(0xc004),
SCTP_PARAM_SUCCESS_REPORT = __constant_htons(0xc005),
- SCTP_PARAM_ADAPTION_LAYER_IND = __constant_htons(0xc006),
+ SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),
} sctp_param_t; /* enum */
@@ -281,11 +281,11 @@ typedef struct sctp_ecn_capable_param {
sctp_paramhdr_t param_hdr;
} __attribute__((packed)) sctp_ecn_capable_param_t;
-/* ADDIP Section 3.2.6 Adaption Layer Indication */
-typedef struct sctp_adaption_ind_param {
+/* ADDIP Section 3.2.6 Adaptation Layer Indication */
+typedef struct sctp_adaptation_ind_param {
struct sctp_paramhdr param_hdr;
- __be32 adaption_ind;
-} __attribute__((packed)) sctp_adaption_ind_param_t;
+ __be32 adaptation_ind;
+} __attribute__((packed)) sctp_adaptation_ind_param_t;
/* RFC 2960. Section 3.3.3 Initiation Acknowledgement (INIT ACK) (2):
* The INIT ACK chunk is used to acknowledge the initiation of an SCTP
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 8d7f26d..c9075d0 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -306,7 +306,7 @@ struct sctp_sock {
__u8 disable_fragments;
__u8 pd_mode;
__u8 v4mapped;
- __u32 adaption_ind;
+ __u32 adaptation_ind;
/* Receive to here while partial delivery is in effect. */
struct sk_buff_head pd_lobby;
@@ -388,7 +388,7 @@ struct sctp_cookie {
/* Padding for future use */
__u8 padding;
- __u32 adaption_ind;
+ __u32 adaptation_ind;
/* This is a shim for my peer's INIT packet, followed by
@@ -431,7 +431,7 @@ union sctp_params {
struct sctp_ipv4addr_param *v4;
struct sctp_ipv6addr_param *v6;
union sctp_addr_param *addr;
- struct sctp_adaption_ind_param *aind;
+ struct sctp_adaptation_ind_param *aind;
};
/* RFC 2960. Section 3.3.5 Heartbeat.
@@ -1483,7 +1483,7 @@ struct sctp_association {
__u8asconf_capable; /* Does peer support ADDIP? */
__u8prsctp_capable; /* Can peer do PR-SCTP? */
- __u32 adaption_ind;/* Adaption Code point. */
+ __u32 adaptation_ind; /* Adaptation Code point. */
/* This mask is used to disable sending the ASCONF chunk
* with specified parameter to peer.
diff --git a/include/net/sctp/ulpevent.h b/include/net/sctp/ulpevent.h
index 1a4ddc1..2923e3d 100644
--- a/include/net/sctp/ulpevent.h
+++ b/include/net/sctp/ulpevent.h
@@ -120,7 +120,7 @@ struct sctp_ulpevent *sctp_ulpevent_make
const struct sctp_association *asoc,
__u32 indication, gfp_t gfp);
-struct sctp_ulpevent *sctp_ulpevent_make_adaption_indication(
+struct sctp_ulpevent *sctp_ulpevent_make_adaptation_indication(
const struct sctp_association *asoc, gfp_t gfp);
struct sctp_ulpevent *sctp_ulpevent_make_rcvmsg(struct sctp_association *asoc,
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 9e4a39f..4116b0d 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -75,8 +75,8 @@ #define SCTP_AUTOCLOSE SCTP_AUTOCLOSE
#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR
SCTP_PRIMARY_ADDR,
#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR
- SCTP_ADAPTION_LAYER,
-#define SCTP_ADAPTION_LAYER SCTP_ADAPTION_LAYER
+ SCTP_ADAPTATION_LAYER,
+#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER
SCTP_DISABLE_FRAGMENTS,
#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS
SCTP_PEER_ADDR_PARAMS,
@@ -331,17 +331,17 @@ struct sctp_shutdown_event {
};
/*
- * 5.3.1.6 SCTP_ADAPTION_INDICATION
+ * 5.3.1.6 SCTP_ADAPTATION_INDICATION
*
- * When a peer sends a Adaption Layer Indication parameter , SCTP
+ * When a peer sends a Adaptation Layer Indication parameter , SCTP
* delivers this notification to inform the application
- * that of the peers requested adaption layer.
+ *
Re: [PATCH 4/4][SCTP]: Change adaption - adaptation as per the latest API draft.
From: Sridhar Samudrala [EMAIL PROTECTED]
Date: Wed, 13 Dec 2006 12:44:52 -0800
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 35108fe..d4f8656 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -180,7 +180,7 @@ typedef enum {
SCTP_PARAM_ERR_CAUSE= __constant_htons(0xc003),
SCTP_PARAM_SET_PRIMARY = __constant_htons(0xc004),
SCTP_PARAM_SUCCESS_REPORT = __constant_htons(0xc005),
- SCTP_PARAM_ADAPTION_LAYER_IND = __constant_htons(0xc006),
+ SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),
} sctp_param_t; /* enum */
I don't care what the API draft says, you will break existing
userspace applications by changing this define.
Please keep around a compatible define, and then add the new one.
Thanks.
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/4][SCTP]: Change adaption - adaptation as per the latest API draft.
On Wed, 2006-12-13 at 16:35 -0800, David Miller wrote:
From: Sridhar Samudrala [EMAIL PROTECTED]
Date: Wed, 13 Dec 2006 12:44:52 -0800
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index 35108fe..d4f8656 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -180,7 +180,7 @@ typedef enum {
SCTP_PARAM_ERR_CAUSE= __constant_htons(0xc003),
SCTP_PARAM_SET_PRIMARY = __constant_htons(0xc004),
SCTP_PARAM_SUCCESS_REPORT = __constant_htons(0xc005),
- SCTP_PARAM_ADAPTION_LAYER_IND = __constant_htons(0xc006),
+ SCTP_PARAM_ADAPTATION_LAYER_IND = __constant_htons(0xc006),
} sctp_param_t; /* enum */
I don't care what the API draft says, you will break existing
userspace applications by changing this define.
Please keep around a compatible define, and then add the new one.
These parameters are not used by user-space apps. They define the
parameters used by the protocol in SCTP headers that go on wire.
The kernel version of SCTP user-space API is present in
include/net/sctp/user.h and this patch does modify names of a socket
option, notification and fields in the associated structures.
But user-space should not use any SCTP kernel header files. It gets this
API via include/netinet/sctp.h that is included in lksctp-tools package.
This patch will not break any existing apps that use the
library/header-file from the released versions of lksctp-tools.
I will add compatible defines in the next release of lksctp-tools so
that it can be used with old apps as well as new apps that can use
the new names.
Thanks
Sridhar
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/4][SCTP]: Change adaption - adaptation as per the latest API draft.
From: Sridhar Samudrala [EMAIL PROTECTED] Date: Wed, 13 Dec 2006 17:38:52 -0800 These parameters are not used by user-space apps. They define the parameters used by the protocol in SCTP headers that go on wire. There is no __KERNEL__ ifdef protection for these defines, and the linux/sctp.h header is exported to userspace via include/linux/Kbuild, therefore the interface is exposed to userspace and you cannot break it. Those are the facts. Your lksctp tool package might provide an alternative header, that's fine, but it doesn't change the situations with respect to linux/sctp.h - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
