ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust to ObjFW changes

Browse source
This commit is contained in:
Jonathan Schleifer 2015-01-05 22:50:58 +01:00
parent c11d1bb945
commit dfe6a0b653
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/XMPPSRVLookup.m
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2011, Jonathan Schleifer <js@webkeks.org> * Copyright (c) 2011, 2012, 2013, 2014, 2015
* Jonathan Schleifer <js@webkeks.org>
* Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de> * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de>
* *
* https://webkeks.org/git/?p=objxmpp.git * https://webkeks.org/git/?p=objxmpp.git
@ -36,6 +37,8 @@
#import "XMPPSRVLookup.h" #import "XMPPSRVLookup.h"
#import <ObjFW/OFSystemInfo.h>
@implementation XMPPSRVEntry @implementation XMPPSRVEntry
+ (instancetype)entryWithPriority: (uint16_t)priority + (instancetype)entryWithPriority: (uint16_t)priority
weight: (uint16_t)weight weight: (uint16_t)weight
@ -108,7 +111,7 @@
_target = [[OFString alloc] _target = [[OFString alloc]
initWithCString: buffer initWithCString: buffer
encoding: [OFString nativeOSEncoding]]; encoding: [OFSystemInfo native8BitEncoding]];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;
@ -217,8 +220,8 @@
exceptionWithHost: _domain]; exceptionWithHost: _domain];
answer = [self allocMemoryWithSize: pageSize]; answer = [self allocMemoryWithSize: pageSize];
answerLen = res_nsearch(&_resState, answerLen = res_nsearch(&_resState, [request
[request cStringWithEncoding: [OFString nativeOSEncoding]], cStringWithEncoding: [OFSystemInfo native8BitEncoding]],
ns_c_in, ns_t_srv, answer, (int)pageSize); ns_c_in, ns_t_srv, answer, (int)pageSize);
if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) || if ((answerLen == -1) && ((h_errno == HOST_NOT_FOUND) ||
@ -264,7 +267,9 @@
/* Look if there already is a list with the priority */ /* Look if there already is a list with the priority */
for (iter = [_list firstListObject]; iter != NULL; iter = iter->next) { for (iter = [_list firstListObject]; iter != NULL; iter = iter->next) {
if ([[iter->object firstObject] priority] == [entry priority]) { XMPPSRVEntry *first = [iter->object firstObject];
if ([first priority] == [entry priority]) {
/* /*
* RFC 2782 says those with weight 0 should be at the * RFC 2782 says those with weight 0 should be at the
* beginning of the list. * beginning of the list.
@ -278,7 +283,7 @@
} }
/* We can't have one if the priority is already bigger */ /* We can't have one if the priority is already bigger */
if ([[iter->object firstObject] priority] > [entry priority]) if ([first priority] > [entry priority])
break; break;
} }