wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-25 01:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2023-09-29 10:05:50 +08:00
commit 7a3845abaf
6 changed files with 16 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
netwerk/sctp/datachannel/DataChannel.cpp
View file

@ -6,7 +6,7 @@
#include <algorithm>
#include <stdio.h>
#include <stdlib.h>
#if !defined(__Userspace_os_Windows)
#if !defined(_WIN32)
#include <arpa/inet.h>
#endif
// usrsctp.h expects to have errno definitions prior to its inclusion.
@ -547,7 +547,7 @@ DataChannelConnection::CompleteConnect(TransportFlow *flow, TransportLayer::Stat
struct sockaddr_conn addr;
memset(&addr, 0, sizeof(addr));
addr.sconn_family = AF_CONN;
#if defined(__Userspace_os_Darwin)
#if defined(__APPLE__)
addr.sconn_len = sizeof(addr);
#endif
addr.sconn_port = htons(mLocalPort);
@ -801,7 +801,7 @@ DataChannelConnection::Connect(const char *addr, unsigned short port)
addr6.sin6_port = htons(port);
mState = CONNECTING;
#if !defined(__Userspace_os_Windows)
#if !defined(_WIN32)
if (inet_pton(AF_INET6, addr, &addr6.sin6_addr) == 1) {
if (usrsctp_connect(mMasterSocket, reinterpret_cast<struct sockaddr *>(&addr6), sizeof(struct sockaddr_in6)) < 0) {
LOG(("*** Failed userspace_connect"));
@ -1555,7 +1555,7 @@ void
DataChannelConnection::HandlePeerAddressChangeEvent(const struct sctp_paddr_change *spc)
{
const char *addr = "";
#if !defined(__Userspace_os_Windows)
#if !defined(_WIN32)
char addr_buf[INET6_ADDRSTRLEN];
struct sockaddr_in *sin;
struct sockaddr_in6 *sin6;
@ -1563,13 +1563,13 @@ DataChannelConnection::HandlePeerAddressChangeEvent(const struct sctp_paddr_chan
switch (spc->spc_aaddr.ss_family) {
case AF_INET:
#if !defined(__Userspace_os_Windows)
#if !defined(_WIN32)
sin = (struct sockaddr_in *)&spc->spc_aaddr;
addr = inet_ntop(AF_INET, &sin->sin_addr, addr_buf, INET6_ADDRSTRLEN);
#endif
break;
case AF_INET6:
#if !defined(__Userspace_os_Windows)
#if !defined(_WIN32)
sin6 = (struct sockaddr_in6 *)&spc->spc_aaddr;
addr = inet_ntop(AF_INET6, &sin6->sin6_addr, addr_buf, INET6_ADDRSTRLEN);
#endif

11
netwerk/sctp/src/README.sctp
View file

@ -1,12 +1,9 @@
This code is imported from the usrsctp library via netwerk/sctp/update_sctp.sh.
This code is imported from the usrsctp library. The current code is version
8e12cd9e01fc94d2e84ea1afa351c845966e116e from git.
The project is accessed via:
The project is accessed on GitHub at the following location:
svn co --username your.username https://sctp-refimpl.googlecode.com/svn/trunk sctpSVN
If you just want a read-only copy use
svn co http://sctp-refimpl.googlecode.com/svn/trunk sctpSVN
https://github.com/sctplab/usrsctp
The usrsctp library is based on the FreeBSD kernel implementation, and the
userspace implementation was largely done my Michael Tuexen and Irene

33
netwerk/sctp/update_sctp.sh
View file

@ -1,33 +0,0 @@
#!/bin/bash
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# assume $1 is the directory with a SVN checkout of the libsctp source
#
# sctp usrlib source is available (via svn) at:
# svn co https://sctp-refimpl.googlecode.com/svn/trunk sctpSVN
#
# also assumes we've made *NO* changes to the SCTP sources! If we do, we have to merge by
# hand after this process, or use a more complex one.
#
# For example, one could update an sctp library import head, and merge back to default. Or keep a
# separate repo with this in it, and pull from there to m-c and merge.
if [ "$1" ] ; then
export date=`date`
export revision=`(cd $1; svnversion -n)`
cp $1/KERN/usrsctp/usrsctplib/*.c $1/KERN/usrsctp/usrsctplib/*.h netwerk/sctp/src
cp $1/KERN/usrsctp/usrsctplib/netinet/*.c $1/KERN/usrsctp/usrsctplib/netinet/*.h netwerk/sctp/src/netinet
cp $1/KERN/usrsctp/usrsctplib/netinet6/*.c $1/KERN/usrsctp/usrsctplib/netinet6/*.h netwerk/sctp/src/netinet6
hg addremove netwerk/sctp/src --include "**.c" --include "**.h" --similarity 90
echo "sctp updated to version $revision from SVN on $date" >> netwerk/sctp/sctp_update.log
echo "sctp updated to version $revision from SVN on $date"
echo "WARNING: reapply any local patches!"
else
echo "usage: $0 path_to_sctpSVN_directory"
echo "run from the root of your m-c clone"
fi