l2tp: set netnsok flag for netlink messages
[linux-3.10.git] / net / l2tp / l2tp_core.h
index 09e4a38..8eb8f1d 100644 (file)
@@ -45,6 +45,7 @@ struct l2tp_stats {
        u64                     rx_oos_packets;
        u64                     rx_errors;
        u64                     rx_cookie_discards;
+       struct u64_stats_sync   syncp;
 };
 
 struct l2tp_tunnel;
@@ -122,6 +123,7 @@ struct l2tp_session {
                                                 * categories */
        int                     reorder_timeout; /* configured reorder timeout
                                                  * (in jiffies) */
+       int                     reorder_skip;   /* set if skip to next nr */
        int                     mtu;
        int                     mru;
        enum l2tp_pwtype        pwtype;
@@ -150,6 +152,10 @@ struct l2tp_tunnel_cfg {
        /* Used only for kernel-created sockets */
        struct in_addr          local_ip;
        struct in_addr          peer_ip;
+#if IS_ENABLED(CONFIG_IPV6)
+       struct in6_addr         *local_ip6;
+       struct in6_addr         *peer_ip6;
+#endif
        u16                     local_udp_port;
        u16                     peer_udp_port;
        unsigned int            use_udp_checksums:1;
@@ -157,6 +163,7 @@ struct l2tp_tunnel_cfg {
 
 struct l2tp_tunnel {
        int                     magic;          /* Should be L2TP_TUNNEL_MAGIC */
+       struct rcu_head rcu;
        rwlock_t                hlist_lock;     /* protect session_hlist */
        struct hlist_head       session_hlist[L2TP_HASH_SIZE];
                                                /* hashed list of sessions,
@@ -181,7 +188,10 @@ struct l2tp_tunnel {
        int (*recv_payload_hook)(struct sk_buff *skb);
        void (*old_sk_destruct)(struct sock *);
        struct sock             *sock;          /* Parent socket */
-       int                     fd;
+       int                     fd;             /* Parent fd, if tunnel socket
+                                                * was created by userspace */
+
+       struct work_struct      del_work;
 
        uint8_t                 priv[0];        /* private data */
 };
@@ -221,6 +231,8 @@ out:
        return tunnel;
 }
 
+extern struct sock *l2tp_tunnel_sock_lookup(struct l2tp_tunnel *tunnel);
+extern void l2tp_tunnel_sock_put(struct sock *sk);
 extern struct l2tp_session *l2tp_session_find(struct net *net, struct l2tp_tunnel *tunnel, u32 session_id);
 extern struct l2tp_session *l2tp_session_find_nth(struct l2tp_tunnel *tunnel, int nth);
 extern struct l2tp_session *l2tp_session_find_by_ifname(struct net *net, char *ifname);
@@ -255,17 +267,36 @@ static inline void l2tp_session_dec_refcount_1(struct l2tp_session *session)
 }
 
 #ifdef L2TP_REFCNT_DEBUG
-#define l2tp_session_inc_refcount(_s) do { \
-               printk(KERN_DEBUG "l2tp_session_inc_refcount: %s:%d %s: cnt=%d\n", __func__, __LINE__, (_s)->name, atomic_read(&_s->ref_count)); \
-               l2tp_session_inc_refcount_1(_s);                                \
-       } while (0)
-#define l2tp_session_dec_refcount(_s) do { \
-               printk(KERN_DEBUG "l2tp_session_dec_refcount: %s:%d %s: cnt=%d\n", __func__, __LINE__, (_s)->name, atomic_read(&_s->ref_count)); \
-               l2tp_session_dec_refcount_1(_s);                                \
-       } while (0)
+#define l2tp_session_inc_refcount(_s)                                  \
+do {                                                                   \
+       pr_debug("l2tp_session_inc_refcount: %s:%d %s: cnt=%d\n",       \
+                __func__, __LINE__, (_s)->name,                        \
+                atomic_read(&_s->ref_count));                          \
+       l2tp_session_inc_refcount_1(_s);                                \
+} while (0)
+#define l2tp_session_dec_refcount(_s)                                  \
+do {                                                                   \
+       pr_debug("l2tp_session_dec_refcount: %s:%d %s: cnt=%d\n",       \
+                __func__, __LINE__, (_s)->name,                        \
+                atomic_read(&_s->ref_count));                          \
+       l2tp_session_dec_refcount_1(_s);                                \
+} while (0)
 #else
 #define l2tp_session_inc_refcount(s) l2tp_session_inc_refcount_1(s)
 #define l2tp_session_dec_refcount(s) l2tp_session_dec_refcount_1(s)
 #endif
 
+#define l2tp_printk(ptr, type, func, fmt, ...)                         \
+do {                                                                   \
+       if (((ptr)->debug) & (type))                                    \
+               func(fmt, ##__VA_ARGS__);                               \
+} while (0)
+
+#define l2tp_warn(ptr, type, fmt, ...)                                 \
+       l2tp_printk(ptr, type, pr_warn, fmt, ##__VA_ARGS__)
+#define l2tp_info(ptr, type, fmt, ...)                                 \
+       l2tp_printk(ptr, type, pr_info, fmt, ##__VA_ARGS__)
+#define l2tp_dbg(ptr, type, fmt, ...)                                  \
+       l2tp_printk(ptr, type, pr_debug, fmt, ##__VA_ARGS__)
+
 #endif /* _L2TP_CORE_H_ */