ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #425 from TheNightmanCodeth/main

This commit is contained in:
Ethan Pippin 2022-05-01 13:38:35 -06:00 committed by GitHub
parent 418161c75a 0ca924c8f2
commit 2aa1607ee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Shared/ServerDiscovery/UDPBroadCastConnection.swift
View File

@ -16,7 +16,6 @@ let INADDR_BROADCAST = in_addr(s_addr: 0xFFFF_FFFF)
/// An object representing the UDP broadcast connection. Uses a dispatch source to handle the incoming traffic on the UDP socket. /// An object representing the UDP broadcast connection. Uses a dispatch source to handle the incoming traffic on the UDP socket.
open class UDPBroadcastConnection { open class UDPBroadcastConnection {
// MARK: Properties // MARK: Properties
/// The address of the UDP socket. /// The address of the UDP socket.
@ -80,7 +79,6 @@ open class UDPBroadcastConnection {
/// ///
/// - Throws: Throws a `ConnectionError` if an error occurs. /// - Throws: Throws a `ConnectionError` if an error occurs.
fileprivate func createSocket() throws { fileprivate func createSocket() throws {
// Create new socket // Create new socket
let newSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP) let newSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)
guard newSocket > 0 else { throw ConnectionError.createSocketFailed } guard newSocket > 0 else { throw ConnectionError.createSocketFailed }
@ -98,9 +96,9 @@ open class UDPBroadcastConnection {
if shouldBeBound { if shouldBeBound {
var saddr = sockaddr(sa_len: 0, sa_family: 0, var saddr = sockaddr(sa_len: 0, sa_family: 0,
sa_data: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)) sa_data: (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
self.address.sin_addr = INADDR_ANY address.sin_addr = INADDR_ANY
memcpy(&saddr, &self.address, MemoryLayout<sockaddr_in>.size) memcpy(&saddr, &address, MemoryLayout<sockaddr_in>.size)
self.address.sin_addr = INADDR_BROADCAST address.sin_addr = INADDR_BROADCAST
let isBound = bind(newSocket, &saddr, socklen_t(MemoryLayout<sockaddr_in>.size)) let isBound = bind(newSocket, &saddr, socklen_t(MemoryLayout<sockaddr_in>.size))
if isBound == -1 { if isBound == -1 {
debugPrint("Couldn't bind socket") debugPrint("Couldn't bind socket")
@ -131,9 +129,11 @@ open class UDPBroadcastConnection {
var socketAddressLength = socklen_t(MemoryLayout<sockaddr_storage>.size) var socketAddressLength = socklen_t(MemoryLayout<sockaddr_storage>.size)
let response = [UInt8](repeating: 0, count: 4096) let response = [UInt8](repeating: 0, count: 4096)
let UDPSocket = Int32(source.handle) let UDPSocket = Int32(source.handle)
let pointer = UnsafeMutablePointer<[UInt8]>.allocate(capacity: response.capacity)
pointer.initialize(to: response)
let bytesRead = withUnsafeMutablePointer(to: &socketAddress) { let bytesRead = withUnsafeMutablePointer(to: &socketAddress) {
recvfrom(UDPSocket, UnsafeMutableRawPointer(mutating: response), response.count, 0, recvfrom(UDPSocket, pointer, response.count, 0,
UnsafeMutableRawPointer($0).bindMemory(to: sockaddr.self, capacity: 1), &socketAddressLength) UnsafeMutableRawPointer($0).bindMemory(to: sockaddr.self, capacity: 1), &socketAddressLength)
} }
@ -151,11 +151,10 @@ open class UDPBroadcastConnection {
} }
} }
guard let endpoint = withUnsafePointer(to: &socketAddress, guard let endpoint = withUnsafePointer(to: &socketAddress, {
{ self
self .getEndpointFromSocketAddress(socketAddressPointer: UnsafeRawPointer($0)
.getEndpointFromSocketAddress(socketAddressPointer: UnsafeRawPointer($0) .bindMemory(to: sockaddr.self, capacity: 1)) })
.bindMemory(to: sockaddr.self, capacity: 1)) })
else { else {
// debugPrint("Failed to get the address and port from the socket address received from recvfrom") // debugPrint("Failed to get the address and port from the socket address received from recvfrom")
self.closeConnection() self.closeConnection()
@ -224,7 +223,7 @@ open class UDPBroadcastConnection {
source.cancel() source.cancel()
responseSource = nil responseSource = nil
} }
if shouldBeBound && reopen { if shouldBeBound, reopen {
dispatchQueue.async { dispatchQueue.async {
do { do {
try self.createSocket() try self.createSocket()
@ -290,7 +289,6 @@ open class UDPBroadcastConnection {
// Copyright © 2019 Gunter Hager. All rights reserved. // Copyright © 2019 Gunter Hager. All rights reserved.
// //
public extension UDPBroadcastConnection { public extension UDPBroadcastConnection {
enum ConnectionError: Error { enum ConnectionError: Error {
// Creating socket // Creating socket
case createSocketFailed case createSocketFailed

2
Swiftfin tvOS/Views/VideoPlayer/Overlays/SmallMenuOverlay.swift
View File

@ -324,7 +324,7 @@ struct SmallMediaStreamSelectionView: View {
ScrollView(.horizontal, showsIndicators: false) { ScrollView(.horizontal, showsIndicators: false) {
ScrollViewReader { reader in ScrollViewReader { reader in
HStack { HStack {
ForEach(0 ..< viewModel.chapters.count) { chapterIndex in ForEach(0 ..< viewModel.chapters.count, id: \.self) { chapterIndex in
VStack(alignment: .leading) { VStack(alignment: .leading) {
Button { Button {
viewModel.playerOverlayDelegate?.didSelectChapter(viewModel.chapters[chapterIndex]) viewModel.playerOverlayDelegate?.didSelectChapter(viewModel.chapters[chapterIndex])