diff options
| author | Petr Vandrovec <vandrove@vc.cvut.cz> | 2002-09-21 01:40:34 +0200 |
|---|---|---|
| committer | Petr Vandrovec <vandrove@vc.cvut.cz> | 2002-09-21 01:40:34 +0200 |
| commit | 32758c3b91a1766db61cdc82837fa1a17e128330 (patch) | |
| tree | 31981fba72b677136c6d1b2530071d5742cf3714 /include/linux | |
| parent | 8612e0886498766a8eca36edb42032e0f4dd3f0d (diff) | |
ncpfs: Proper handling of watchdog packets.
ncpfs: Add support for packet signatures when using TCP transport.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ncp.h | 1 | ||||
| -rw-r--r-- | include/linux/ncp_fs_sb.h | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/include/linux/ncp.h b/include/linux/ncp.h index fa20708267b9..92062440abb0 100644 --- a/include/linux/ncp.h +++ b/include/linux/ncp.h @@ -30,6 +30,7 @@ struct ncp_request_header { }; #define NCP_REPLY (0x3333) +#define NCP_WATCHDOG (0x3E3E) #define NCP_POSITIVE_ACK (0x9999) struct ncp_reply_header { diff --git a/include/linux/ncp_fs_sb.h b/include/linux/ncp_fs_sb.h index 7bc6b250cdd5..375c8511ca25 100644 --- a/include/linux/ncp_fs_sb.h +++ b/include/linux/ncp_fs_sb.h @@ -13,6 +13,8 @@ #ifdef __KERNEL__ +#include <linux/tqueue.h> + #define NCP_DEFAULT_OPTIONS 0 /* 2 for packet signatures */ struct ncp_server { @@ -24,6 +26,7 @@ struct ncp_server { __u8 name_space[NCP_NUMBER_OF_VOLUMES + 2]; struct file *ncp_filp; /* File pointer to ncp socket */ + struct socket *ncp_sock;/* ncp socket */ u8 sequence; u8 task; @@ -79,8 +82,50 @@ struct ncp_server { /* miscellaneous */ unsigned int flags; + + spinlock_t requests_lock; /* Lock accesses to tx.requests, tx.creq and rcv.creq when STREAM mode */ + + void (*data_ready)(struct sock* sk, int len); + void (*error_report)(struct sock* sk); + void (*write_space)(struct sock* sk); /* STREAM mode only */ + struct { + struct tq_struct tq; /* STREAM/DGRAM: data/error ready */ + struct ncp_request_reply* creq; /* STREAM/DGRAM: awaiting reply from this request */ + struct semaphore creq_sem; /* DGRAM only: lock accesses to rcv.creq */ + + unsigned int state; /* STREAM only: receiver state */ + struct { + __u32 magic __attribute__((packed)); + __u32 len __attribute__((packed)); + __u16 type __attribute__((packed)); + __u16 p1 __attribute__((packed)); + __u16 p2 __attribute__((packed)); + __u16 p3 __attribute__((packed)); + __u16 type2 __attribute__((packed)); + } buf; /* STREAM only: temporary buffer */ + unsigned char* ptr; /* STREAM only: pointer to data */ + size_t len; /* STREAM only: length of data to receive */ + } rcv; + struct { + struct list_head requests; /* STREAM only: queued requests */ + struct tq_struct tq; /* STREAM only: transmitter ready */ + struct ncp_request_reply* creq; /* STREAM only: currently transmitted entry */ + } tx; + struct timer_list timeout_tm; /* DGRAM only: timeout timer */ + struct tq_struct timeout_tq; /* DGRAM only: associated queue, we run timers from process context */ + int timeout_last; /* DGRAM only: current timeout length */ + int timeout_retries; /* DGRAM only: retries left */ }; +extern void ncp_tcp_rcv_proc(void *server); +extern void ncp_tcp_tx_proc(void *server); +extern void ncpdgram_rcv_proc(void *server); +extern void ncpdgram_timeout_proc(void *server); +extern void ncpdgram_timeout_call(unsigned long server); +extern void ncp_tcp_data_ready(struct sock* sk, int len); +extern void ncp_tcp_write_space(struct sock* sk); +extern void ncp_tcp_error_report(struct sock* sk); + #define NCP_FLAG_UTF8 1 #define NCP_CLR_FLAG(server, flag) ((server)->flags &= ~(flag)) |