Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
450
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
2149dc73
Commit
2149dc73
authored
4 years ago
by
Pierre Lamot
Browse files
Options
Downloads
Patches
Plain Diff
contrib: enable IPv6 support in libsmb2
parent
29060263
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/smb2/0006-IPv6-is-available-on-all-platforms.patch
+46
-0
46 additions, 0 deletions
...ib/src/smb2/0006-IPv6-is-available-on-all-platforms.patch
contrib/src/smb2/rules.mak
+1
-0
1 addition, 0 deletions
contrib/src/smb2/rules.mak
with
47 additions
and
0 deletions
contrib/src/smb2/0006-IPv6-is-available-on-all-platforms.patch
0 → 100644
+
46
−
0
View file @
2149dc73
From 0ddce21e13cd032adba26260f977b54d395f98c7 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Thu, 20 Feb 2020 13:39:27 +1000
Subject: [PATCH] IPv6 is available on all platforms. No need to check for it
We weren't even checking for this in configure.ac anyway.
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
---
CMakeLists.txt | 2 +-
lib/socket.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adc5060..f96c713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@
set(core_DEPENDS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE)
if(CMAKE_SYSTEM_NAME MATCHES Windows)
list(APPEND CORE_LIBRARIES ws2_32.lib)
- add_definitions(-DWIN32_LEAN_AND_MEAN -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -DHAVE_SOCKADDR_IN6)
+ add_definitions(-DWIN32_LEAN_AND_MEAN -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
include_directories(include/msvc)
elseif(CMAKE_SYSTEM_NAME STREQUAL Solaris)
find_library(SOCKET_LIBRARY socket)
diff --git a/lib/socket.c b/lib/socket.c
index 3cdecef..6340788 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -744,7 +744,6 @@
smb2_connect_async(struct smb2_context *smb2, const char *server,
((struct sockaddr_in *)&ss)->sin_len = socksize;
#endif
break;
-#ifdef HAVE_SOCKADDR_IN6
case AF_INET6:
socksize = sizeof(struct sockaddr_in6);
memcpy(&ss, ai->ai_addr, socksize);
@@ -752,7 +751,6 @@
smb2_connect_async(struct smb2_context *smb2, const char *server,
((struct sockaddr_in6 *)&ss)->sin6_len = socksize;
#endif
break;
-#endif
default:
smb2_set_error(smb2, "Unknown address family :%d. "
"Only IPv4/IPv6 supported so far.",
This diff is collapsed.
Click to expand it.
contrib/src/smb2/rules.mak
+
1
−
0
View file @
2149dc73
...
...
@@ -23,6 +23,7 @@ smb2: libsmb2-$(SMB2_VERSION).tar.gz .sum-smb2
$(
APPLY
)
$(
SRC
)
/smb2/0003-Fix-getlogin-usage.patch
$(
APPLY
)
$(
SRC
)
/smb2/0004-smb2_destroy_context-fix-possible-null-deref.patch
$(
APPLY
)
$(
SRC
)
/smb2/0005-smb2_connect_share_async-don-t-return-ENOMEM-if-conn.patch
$(
APPLY
)
$(
SRC
)
/smb2/0006-IPv6-is-available-on-all-platforms.patch
$(
MOVE
)
.smb2
:
smb2
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment