projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tipc: move message validation function to msg.c
[deliverable/linux.git]
/
net
/
tipc
/
msg.h
diff --git
a/net/tipc/msg.h
b/net/tipc/msg.h
index 9ace47f44a69ed3000c6739aee55fbf30b04081c..62306b8d2410d83dadb6e2f5cd7477c6b7425977 100644
(file)
--- a/
net/tipc/msg.h
+++ b/
net/tipc/msg.h
@@
-1,7
+1,7
@@
/*
* net/tipc/msg.h: Include file for TIPC message header routines
*
/*
* net/tipc/msg.h: Include file for TIPC message header routines
*
- * Copyright (c) 2000-2007, 2014
,
Ericsson AB
+ * Copyright (c) 2000-2007, 2014
-2015
Ericsson AB
* Copyright (c) 2005-2008, 2010-2011, Wind River Systems
* All rights reserved.
*
* Copyright (c) 2005-2008, 2010-2011, Wind River Systems
* All rights reserved.
*
@@
-76,7
+76,7
@@
struct plist;
#define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE)
#define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE)
-#define TIPC_MEDIA_
ADDR
_OFFSET 5
+#define TIPC_MEDIA_
INFO
_OFFSET 5
/**
* TIPC message buffer code
/**
* TIPC message buffer code
@@
-87,12
+87,12
@@
struct plist;
* Note: Headroom should be a multiple of 4 to ensure the TIPC header fields
* are word aligned for quicker access
*/
* Note: Headroom should be a multiple of 4 to ensure the TIPC header fields
* are word aligned for quicker access
*/
-#define BUF_HEADROOM
LL_MAX_HEADER
+#define BUF_HEADROOM
(LL_MAX_HEADER + 48)
struct tipc_skb_cb {
void *handle;
struct sk_buff *tail;
struct tipc_skb_cb {
void *handle;
struct sk_buff *tail;
- bool
deferr
ed;
+ bool
validat
ed;
bool wakeup_pending;
bool bundling;
u16 chain_sz;
bool wakeup_pending;
bool bundling;
u16 chain_sz;
@@
-510,7
+510,6
@@
static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m)
#define DSC_REQ_MSG 0
#define DSC_RESP_MSG 1
#define DSC_REQ_MSG 0
#define DSC_RESP_MSG 1
-
/*
* Word 1
*/
/*
* Word 1
*/
@@
-534,6
+533,16
@@
static inline void msg_set_node_sig(struct tipc_msg *m, u32 n)
msg_set_bits(m, 1, 0, 0xffff, n);
}
msg_set_bits(m, 1, 0, 0xffff, n);
}
+static inline u32 msg_node_capabilities(struct tipc_msg *m)
+{
+ return msg_bits(m, 1, 15, 0x1fff);
+}
+
+static inline void msg_set_node_capabilities(struct tipc_msg *m, u32 n)
+{
+ msg_set_bits(m, 1, 15, 0x1fff, n);
+}
+
/*
* Word 2
/*
* Word 2
@@
-688,7
+697,7
@@
static inline void msg_set_redundant_link(struct tipc_msg *m, u32 r)
static inline char *msg_media_addr(struct tipc_msg *m)
{
static inline char *msg_media_addr(struct tipc_msg *m)
{
- return (char *)&m->hdr[TIPC_MEDIA_
ADDR
_OFFSET];
+ return (char *)&m->hdr[TIPC_MEDIA_
INFO
_OFFSET];
}
/*
}
/*
@@
-749,6
+758,7
@@
static inline u32 msg_tot_origport(struct tipc_msg *m)
}
struct sk_buff *tipc_buf_acquire(u32 size);
}
struct sk_buff *tipc_buf_acquire(u32 size);
+bool tipc_msg_validate(struct sk_buff *skb);
bool tipc_msg_reverse(u32 own_addr, struct sk_buff *buf, u32 *dnode,
int err);
void tipc_msg_init(u32 own_addr, struct tipc_msg *m, u32 user, u32 type,
bool tipc_msg_reverse(u32 own_addr, struct sk_buff *buf, u32 *dnode,
int err);
void tipc_msg_init(u32 own_addr, struct tipc_msg *m, u32 user, u32 type,
This page took
0.033004 seconds
and
5
git commands to generate.