ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-01 10:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/peter-iakovlev/TelegramCore

Browse Source
This commit is contained in:
overtake 2017-04-20 18:58:36 +03:00
commit 47df0e451a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TelegramCore/ManagedConfigurationUpdates.swift
View File

@ -22,7 +22,9 @@ func managedConfigurationUpdates(postbox: Postbox, network: Network) -> Signal<V
if addressList[Int(id)] == nil { if addressList[Int(id)] == nil {
addressList[Int(id)] = [] addressList[Int(id)] = []
} }
addressList[Int(id)]!.append(MTDatacenterAddress(ip: ipAddress, port: UInt16(port), preferForMedia: preferForMedia, restrictToTcp: false)) let restrictToTcp = (flags & (1 << 2)) != 0
let isCdn = (flags & (1 << 3)) != 0
addressList[Int(id)]!.append(MTDatacenterAddress(ip: ipAddress, port: UInt16(port), preferForMedia: preferForMedia, restrictToTcp: restrictToTcp, cdn: isCdn))
} }
} }
network.context.performBatchUpdates { network.context.performBatchUpdates {

2
TelegramCore/Network.swift
View File

@ -326,7 +326,7 @@ func initializedNetwork(apiId: Int32, supplementary: Bool, datacenterId: Int, ke
} }
for (id, ip) in seedAddressList { for (id, ip) in seedAddressList {
context.setSeedAddressSetForDatacenterWithId(id, seedAddressSet: MTDatacenterAddressSet(addressList: [MTDatacenterAddress(ip: ip, port: 443, preferForMedia: false, restrictToTcp: false)])) context.setSeedAddressSetForDatacenterWithId(id, seedAddressSet: MTDatacenterAddressSet(addressList: [MTDatacenterAddress(ip: ip, port: 443, preferForMedia: false, restrictToTcp: false, cdn: false)]))
} }
context.keychain = keychain context.keychain = keychain

4
TelegramCore/Serialization.swift
View File

@ -63,7 +63,9 @@ public class Serialization: NSObject, MTSerialization {
switch option { switch option {
case let .dcOption(flags, id, ipAddress, port) where id == datacenterId: case let .dcOption(flags, id, ipAddress, port) where id == datacenterId:
let preferForMedia = (flags & (1 << 1)) != 0 let preferForMedia = (flags & (1 << 1)) != 0
addressList.append(MTDatacenterAddress(ip: ipAddress, port: UInt16(port), preferForMedia: preferForMedia, restrictToTcp: false)) let restrictToTcp = (flags & (1 << 2)) != 0
let isCdn = (flags & (1 << 3)) != 0
addressList.append(MTDatacenterAddress(ip: ipAddress, port: UInt16(port), preferForMedia: preferForMedia, restrictToTcp: restrictToTcp, cdn: isCdn))
break break
default: default:
break break