cifs: Allow binding to local IP address.
Subsystems (2)
When using multi-homed machines, it's nice to be able to specify the local IP to use for outbound connections. This patch gives cifs the ability to bind to a particular IP address.
Usage: mount -t cifs -o srcaddr=192.168.1.50,user=foo, ...
Usage: mount -t cifs -o srcaddr=2002::100:1,user=foo, ...
Signed-off-by Ben Greear <greearb-my8/[email protected]>
---
:100644 100644 b7431af... d70bc6b... M fs/cifs/cifsfs.c
:100644 100644 d82f5fb... d6f0a7d... M fs/cifs/cifsfs.h
:100644 100644 c9d0cfc... 784fd4a... M fs/cifs/cifsglob.h
:100644 100644 ec0ea4a... 001fbb9... M fs/cifs/connect.c
fs/cifs/cifsfs.c | 29 +++++++++++++++++ fs/cifs/cifsfs.h | 3 ++ fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 119 insertions(+), 2 deletions(-)
fs/cifs/cifsfs.c +29 -0
@@ -357,6 +357,20 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server) } } +bool +cifs_addr_is_specified (struct sockaddr *srcaddr) { +struct sockaddr_in *saddr4 = (struct sockaddr_in *)srcaddr; +struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; +static const struct in6_addr c_in6addr_any =IN6ADDR_ANY_INIT ; +switch (srcaddr->sa_family) { +case AF_INET : +return saddr4->sin_addr.s_addr !=0 ; +case AF_INET6 : +return (!ipv6_addr_equal (&c_in6addr_any, &saddr6->sin6_addr)); + } +return false; +} +/* * cifs_show_options() is for displaying mount options in /proc/mounts. * Not all settable options are displayed but most of the important
@@ -367,6 +381,8 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) {struct cifs_sb_info *cifs_sb =CIFS_SB (m->mnt_sb);struct cifsTconInfo *tcon = cifs_sb->tcon; +struct sockaddr *srcaddr; + srcaddr = (struct sockaddr *)(&tcon->ses->server->srcaddr);seq_printf (s,",unc=%s" , tcon->treeName);if (tcon->ses->userName)
@@ -374,6 +390,19 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)if (tcon->ses->domainName)seq_printf (s,",domain=%s" , tcon->ses->domainName); +if (cifs_addr_is_specified (srcaddr)) { +struct sockaddr_in *saddr4; +struct sockaddr_in6 *saddr6; + saddr4 = (struct sockaddr_in *)srcaddr; + saddr6 = (struct sockaddr_in6 *)srcaddr; +if (saddr6->sin6_family ==AF_INET6 ) +seq_printf (s,",srcaddr=%pI6c" , + &saddr6->sin6_addr); +else +seq_printf (s,",srcaddr=%pI4" , + &saddr4->sin_addr.s_addr); + } +seq_printf (s,",uid=%d" , cifs_sb->mnt_uid);if (cifs_sb->mnt_cifs_flags &CIFS_MOUNT_OVERR_UID )seq_printf (s,",forceuid" );
fs/cifs/cifsfs.h +3 -0
@@ -110,6 +110,9 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);extern ssize_t cifs_listxattr (struct dentry *,char *,size_t );extern long cifs_ioctl (struct file *filep,unsigned int cmd,unsigned long arg); +struct sockaddr ; +extern bool cifs_addr_is_specified (struct sockaddr *srcaddr); +#ifdef CONFIG_CIFS_EXPERIMENTAL extern const struct export_operations cifs_export_ops;#endif /* EXPERIMENTAL */
fs/cifs/cifsglob.h +1 -0
@@ -157,6 +157,7 @@ struct TCP_Server_Info {struct sockaddr_in sockAddr;struct sockaddr_in6 sockAddr6; } addr; +struct sockaddr_storage srcaddr;/* locally bind to this IP */ wait_queue_head_t response_q;wait_queue_head_t request_q;/* if more than maxmpx to srvr must block*/ struct list_head pending_mid_q;
fs/cifs/connect.c +86 -2
149 lines not on this page · raw message
Signature · 1 line
1.6.2.5