diff options
author | Jeff Layton <jlayton@redhat.com> | 2008-12-01 15:23:50 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-12-25 21:29:09 -0500 |
commit | 8ecaf67a8ea58c8f131ff045475c74e9538d6b7a (patch) | |
tree | 115e941e0c13e633b7cb5fb9c9307c4e108533ad /fs/cifs/connect.c | |
parent | 954d7a1cf12158fed23dd8b0f3f563d5a5c97f28 (diff) |
cifs: account for IPv6 in ses->serverName and clean up netbios name handling
The current code for setting the session serverName is IPv4-specific.
Allow it to be an IPv6 address as well. Use NIP* macros to set the
format.
This also entails increasing the length of the serverName field, so
declare a new macro for RFC1001 name length and use it in the
appropriate places.
Finally, drop the unicode_server_Name field from TCP_Server_Info since
it's not used. We can add it back later if needed, but for now it just
wastes memory.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 61b68a0ee2ff..65c121940060 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -1690,22 +1690,30 @@ ipv4_connect(struct sockaddr_in *psin_server, struct socket **csocket, | |||
1690 | if (ses_init_buf) { | 1690 | if (ses_init_buf) { |
1691 | ses_init_buf->trailer.session_req.called_len = 32; | 1691 | ses_init_buf->trailer.session_req.called_len = 32; |
1692 | if (target_name && (target_name[0] != 0)) { | 1692 | if (target_name && (target_name[0] != 0)) { |
1693 | rfc1002mangle(ses_init_buf->trailer.session_req.called_name, | 1693 | rfc1002mangle(ses_init_buf->trailer. |
1694 | target_name, 16); | 1694 | session_req.called_name, |
1695 | target_name, | ||
1696 | RFC1001_NAME_LEN_WITH_NULL); | ||
1695 | } else { | 1697 | } else { |
1696 | rfc1002mangle(ses_init_buf->trailer.session_req.called_name, | 1698 | rfc1002mangle(ses_init_buf->trailer. |
1697 | DEFAULT_CIFS_CALLED_NAME, 16); | 1699 | session_req.called_name, |
1700 | DEFAULT_CIFS_CALLED_NAME, | ||
1701 | RFC1001_NAME_LEN_WITH_NULL); | ||
1698 | } | 1702 | } |
1699 | 1703 | ||
1700 | ses_init_buf->trailer.session_req.calling_len = 32; | 1704 | ses_init_buf->trailer.session_req.calling_len = 32; |
1701 | /* calling name ends in null (byte 16) from old smb | 1705 | /* calling name ends in null (byte 16) from old smb |
1702 | convention. */ | 1706 | convention. */ |
1703 | if (netbios_name && (netbios_name[0] != 0)) { | 1707 | if (netbios_name && (netbios_name[0] != 0)) { |
1704 | rfc1002mangle(ses_init_buf->trailer.session_req.calling_name, | 1708 | rfc1002mangle(ses_init_buf->trailer. |
1705 | netbios_name, 16); | 1709 | session_req.calling_name, |
1710 | netbios_name, | ||
1711 | RFC1001_NAME_LEN_WITH_NULL); | ||
1706 | } else { | 1712 | } else { |
1707 | rfc1002mangle(ses_init_buf->trailer.session_req.calling_name, | 1713 | rfc1002mangle(ses_init_buf->trailer. |
1708 | "LINUX_CIFS_CLNT", 16); | 1714 | session_req.calling_name, |
1715 | "LINUX_CIFS_CLNT", | ||
1716 | RFC1001_NAME_LEN_WITH_NULL); | ||
1709 | } | 1717 | } |
1710 | ses_init_buf->trailer.session_req.scope1 = 0; | 1718 | ses_init_buf->trailer.session_req.scope1 = 0; |
1711 | ses_init_buf->trailer.session_req.scope2 = 0; | 1719 | ses_init_buf->trailer.session_req.scope2 = 0; |
@@ -2194,9 +2202,11 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2194 | } | 2202 | } |
2195 | rc = 0; | 2203 | rc = 0; |
2196 | memcpy(srvTcp->workstation_RFC1001_name, | 2204 | memcpy(srvTcp->workstation_RFC1001_name, |
2197 | volume_info.source_rfc1001_name, 16); | 2205 | volume_info.source_rfc1001_name, |
2206 | RFC1001_NAME_LEN_WITH_NULL); | ||
2198 | memcpy(srvTcp->server_RFC1001_name, | 2207 | memcpy(srvTcp->server_RFC1001_name, |
2199 | volume_info.target_rfc1001_name, 16); | 2208 | volume_info.target_rfc1001_name, |
2209 | RFC1001_NAME_LEN_WITH_NULL); | ||
2200 | srvTcp->sequence_number = 0; | 2210 | srvTcp->sequence_number = 0; |
2201 | INIT_LIST_HEAD(&srvTcp->tcp_ses_list); | 2211 | INIT_LIST_HEAD(&srvTcp->tcp_ses_list); |
2202 | INIT_LIST_HEAD(&srvTcp->smb_ses_list); | 2212 | INIT_LIST_HEAD(&srvTcp->smb_ses_list); |
@@ -2235,8 +2245,12 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb, | |||
2235 | 2245 | ||
2236 | /* new SMB session uses our srvTcp ref */ | 2246 | /* new SMB session uses our srvTcp ref */ |
2237 | pSesInfo->server = srvTcp; | 2247 | pSesInfo->server = srvTcp; |
2238 | sprintf(pSesInfo->serverName, "%u.%u.%u.%u", | 2248 | if (addr.sa_family == AF_INET6) |
2239 | NIPQUAD(sin_server->sin_addr.s_addr)); | 2249 | sprintf(pSesInfo->serverName, NIP6_FMT, |
2250 | NIP6(sin_server6->sin6_addr)); | ||
2251 | else | ||
2252 | sprintf(pSesInfo->serverName, NIPQUAD_FMT, | ||
2253 | NIPQUAD(sin_server->sin_addr.s_addr)); | ||
2240 | 2254 | ||
2241 | write_lock(&cifs_tcp_ses_lock); | 2255 | write_lock(&cifs_tcp_ses_lock); |
2242 | list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list); | 2256 | list_add(&pSesInfo->smb_ses_list, &srvTcp->smb_ses_list); |