Skip to content

Commit 2999f6c

Browse files
author
Antonis
committed
Fixed #558: Fix leak of RCConnection that prevents RCDevice to get freed
1 parent 39c2734 commit 2999f6c

File tree

5 files changed

+86
-1
lines changed

5 files changed

+86
-1
lines changed

‎Examples/restcomm-olympus/restcomm-olympus.xcodeproj/project.pbxproj

+66
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/* End PBXAggregateTarget section */
2323

2424
/* Begin PBXBuildFile section */
25+
8D077AE924D682A3864EB1B6 /* libPods-restcomm-olympus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BC4348E4400029D41BAF43FE /* libPods-restcomm-olympus.a */; };
2526
AE0A08351DD2101100641151 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE0A08341DD2101100641151 /* CoreMotion.framework */; };
2627
AE155F541CCF8658002F404E /* ToastController.m in Sources */ = {isa = PBXBuildFile; fileRef = AE155F531CCF8658002F404E /* ToastController.m */; };
2728
AE20DA841CE31EC200695925 /* speaker-on-50x50.png in Resources */ = {isa = PBXBuildFile; fileRef = AE20DA811CE31EC200695925 /* speaker-on-50x50.png */; };
@@ -219,6 +220,7 @@
219220
/* End PBXCopyFilesBuildPhase section */
220221

221222
/* Begin PBXFileReference section */
223+
7E04E0726E9DAAD39F403925 /* Pods-restcomm-olympus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-restcomm-olympus.debug.xcconfig"; path = "Pods/Target Support Files/Pods-restcomm-olympus/Pods-restcomm-olympus.debug.xcconfig"; sourceTree = "<group>"; };
222224
AE0A08341DD2101100641151 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
223225
AE155F521CCF8658002F404E /* ToastController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ToastController.h; sourceTree = "<group>"; };
224226
AE155F531CCF8658002F404E /* ToastController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ToastController.m; sourceTree = "<group>"; };
@@ -416,6 +418,8 @@
416418
AEED2F0B1C7F252000006E76 /* SIPSettingsNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SIPSettingsNavigationController.m; sourceTree = "<group>"; };
417419
AEFA3BCB1C7F32E600ECD02F /* ICESettingsNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICESettingsNavigationController.h; sourceTree = "<group>"; };
418420
AEFA3BCC1C7F32E600ECD02F /* ICESettingsNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICESettingsNavigationController.m; sourceTree = "<group>"; };
421+
BC4348E4400029D41BAF43FE /* libPods-restcomm-olympus.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-restcomm-olympus.a"; sourceTree = BUILT_PRODUCTS_DIR; };
422+
DEB244673BF1A52D93E92613 /* Pods-restcomm-olympus.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-restcomm-olympus.release.xcconfig"; path = "Pods/Target Support Files/Pods-restcomm-olympus/Pods-restcomm-olympus.release.xcconfig"; sourceTree = "<group>"; };
419423
/* End PBXFileReference section */
420424

421425
/* Begin PBXFrameworksBuildPhase section */
@@ -425,6 +429,7 @@
425429
files = (
426430
AE0A08351DD2101100641151 /* CoreMotion.framework in Frameworks */,
427431
AEA4967F1C2997F6000D9762 /* libTestFairy.a in Frameworks */,
432+
8D077AE924D682A3864EB1B6 /* libPods-restcomm-olympus.a in Frameworks */,
428433
);
429434
runOnlyForDeploymentPostprocessing = 0;
430435
};
@@ -438,6 +443,15 @@
438443
/* End PBXFrameworksBuildPhase section */
439444

440445
/* Begin PBXGroup section */
446+
A3CF81123D358C8601AD0862 /* Pods */ = {
447+
isa = PBXGroup;
448+
children = (
449+
7E04E0726E9DAAD39F403925 /* Pods-restcomm-olympus.debug.xcconfig */,
450+
DEB244673BF1A52D93E92613 /* Pods-restcomm-olympus.release.xcconfig */,
451+
);
452+
name = Pods;
453+
sourceTree = "<group>";
454+
};
441455
AE3E52C31C57BB7B0057F5D0 /* cert */ = {
442456
isa = PBXGroup;
443457
children = (
@@ -454,6 +468,7 @@
454468
AE79D31719BC8DAD0023306C /* Products */,
455469
AEA495651C2997F6000D9762 /* restcomm-olympus */,
456470
AED0B05F1A0976F8008A6057 /* restcomm-olympusTests */,
471+
A3CF81123D358C8601AD0862 /* Pods */,
457472
);
458473
sourceTree = "<group>";
459474
};
@@ -470,6 +485,7 @@
470485
isa = PBXGroup;
471486
children = (
472487
AE0A08341DD2101100641151 /* CoreMotion.framework */,
488+
BC4348E4400029D41BAF43FE /* libPods-restcomm-olympus.a */,
473489
);
474490
name = Frameworks;
475491
sourceTree = "<group>";
@@ -728,10 +744,13 @@
728744
isa = PBXNativeTarget;
729745
buildConfigurationList = AE79D34B19BC8DAE0023306C /* Build configuration list for PBXNativeTarget "restcomm-olympus" */;
730746
buildPhases = (
747+
54FAC50C676569AB62D7A177 /* [CP] Check Pods Manifest.lock */,
731748
AE79D31219BC8DAD0023306C /* Sources */,
732749
AE79D31319BC8DAD0023306C /* Frameworks */,
733750
AE79D31419BC8DAD0023306C /* Resources */,
734751
AE7D36491D9E707F00610033 /* Embed Frameworks */,
752+
4D093DA00E5D5809F67951E4 /* [CP] Embed Pods Frameworks */,
753+
C3CFD8736FDBD50DD78AA037 /* [CP] Copy Pods Resources */,
735754
);
736755
buildRules = (
737756
);
@@ -967,6 +986,36 @@
967986
/* End PBXResourcesBuildPhase section */
968987

969988
/* Begin PBXShellScriptBuildPhase section */
989+
4D093DA00E5D5809F67951E4 /* [CP] Embed Pods Frameworks */ = {
990+
isa = PBXShellScriptBuildPhase;
991+
buildActionMask = 2147483647;
992+
files = (
993+
);
994+
inputPaths = (
995+
);
996+
name = "[CP] Embed Pods Frameworks";
997+
outputPaths = (
998+
);
999+
runOnlyForDeploymentPostprocessing = 0;
1000+
shellPath = /bin/sh;
1001+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-restcomm-olympus/Pods-restcomm-olympus-frameworks.sh\"\n";
1002+
showEnvVarsInLog = 0;
1003+
};
1004+
54FAC50C676569AB62D7A177 /* [CP] Check Pods Manifest.lock */ = {
1005+
isa = PBXShellScriptBuildPhase;
1006+
buildActionMask = 2147483647;
1007+
files = (
1008+
);
1009+
inputPaths = (
1010+
);
1011+
name = "[CP] Check Pods Manifest.lock";
1012+
outputPaths = (
1013+
);
1014+
runOnlyForDeploymentPostprocessing = 0;
1015+
shellPath = /bin/sh;
1016+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
1017+
showEnvVarsInLog = 0;
1018+
};
9701019
AED9718819E98B77000F7A8E /* ShellScript */ = {
9711020
isa = PBXShellScriptBuildPhase;
9721021
buildActionMask = 2147483647;
@@ -993,6 +1042,21 @@
9931042
shellPath = /bin/sh;
9941043
shellScript = "cd \"${PROJECT_DIR}/doc\"\ndoxygen Doxyfile";
9951044
};
1045+
C3CFD8736FDBD50DD78AA037 /* [CP] Copy Pods Resources */ = {
1046+
isa = PBXShellScriptBuildPhase;
1047+
buildActionMask = 2147483647;
1048+
files = (
1049+
);
1050+
inputPaths = (
1051+
);
1052+
name = "[CP] Copy Pods Resources";
1053+
outputPaths = (
1054+
);
1055+
runOnlyForDeploymentPostprocessing = 0;
1056+
shellPath = /bin/sh;
1057+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-restcomm-olympus/Pods-restcomm-olympus-resources.sh\"\n";
1058+
showEnvVarsInLog = 0;
1059+
};
9961060
/* End PBXShellScriptBuildPhase section */
9971061

9981062
/* Begin PBXSourcesBuildPhase section */
@@ -1165,6 +1229,7 @@
11651229
};
11661230
AE79D34C19BC8DAE0023306C /* Debug */ = {
11671231
isa = XCBuildConfiguration;
1232+
baseConfigurationReference = 7E04E0726E9DAAD39F403925 /* Pods-restcomm-olympus.debug.xcconfig */;
11681233
buildSettings = {
11691234
ARCHS = "$(ARCHS_STANDARD)";
11701235
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1204,6 +1269,7 @@
12041269
};
12051270
AE79D34D19BC8DAE0023306C /* Release */ = {
12061271
isa = XCBuildConfiguration;
1272+
baseConfigurationReference = DEB244673BF1A52D93E92613 /* Pods-restcomm-olympus.release.xcconfig */;
12071273
buildSettings = {
12081274
ARCHS = "$(ARCHS_STANDARD)";
12091275
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;

‎Examples/restcomm-olympus/restcomm-olympus/CallViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838

3939
@protocol CallDelegate <NSObject>
4040
//- (void)callViewController:(CallViewController *)callViewController didSendStatus:(NSString *)status;
41-
@end
41+
@end

‎RestCommClient/Classes/RCConnection.m

+11
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ - (void)disconnect
169169
[self.ringingPlayer stop];
170170
self.ringingPlayer.currentTime = 0.0;
171171
}
172+
173+
[self handleDisconnected];
172174
}
173175

174176
- (void)sendDigits:(NSString*)digits
@@ -243,6 +245,11 @@ - (void)sipManagerDidReceiveOutgoingRinging:(SipManager*)sipManager
243245
[self.delegate connectionDidStartConnecting:self];
244246
}
245247

248+
- (void) handleDisconnected
249+
{
250+
[self.device clearCurrentConnection];
251+
}
252+
246253
- (void)sipManagerDidReceiveOutgoingEstablished:(SipManager*)sipManager
247254
{
248255
RCLogNotice("[RCConnection sipManagerDidReceiveOutgoingEstablished]");
@@ -281,6 +288,7 @@ - (void)sipManagerDidReceiveOutgoingCancelled:(SipManager*)sipManager;
281288
self.state = RCConnectionStateDisconnected;
282289
[self.delegate connectionDidDisconnect:self];
283290
self.device.state = RCDeviceStateReady;
291+
[self handleDisconnected];
284292
}
285293

286294
- (void)sipManagerDidReceiveOutgoingDeclined:(SipManager*)sipManager;
@@ -294,6 +302,7 @@ - (void)sipManagerDidReceiveOutgoingDeclined:(SipManager*)sipManager;
294302
self.state = RCConnectionStateDisconnected;
295303
[self.delegate connectionDidGetDeclined:self];
296304
self.device.state = RCDeviceStateReady;
305+
[self handleDisconnected];
297306
}
298307

299308
- (void)sipManagerDidReceiveBye:(SipManager*)sipManager;
@@ -312,6 +321,7 @@ - (void)sipManagerDidReceiveBye:(SipManager*)sipManager;
312321
if (self.device.state != RCDeviceStateOffline) {
313322
self.device.state = RCDeviceStateReady;
314323
}
324+
[self handleDisconnected];
315325
}
316326

317327
- (void)sipManagerDidReceiveIncomingCancelled:(SipManager*)sipManager;
@@ -326,6 +336,7 @@ - (void)sipManagerDidReceiveIncomingCancelled:(SipManager*)sipManager;
326336
self.state = RCConnectionStateDisconnected;
327337
[self.delegate connectionDidCancel:self];
328338
self.device.state = RCDeviceStateReady;
339+
[self handleDisconnected];
329340
}
330341

331342
- (void)sipManager:(SipManager*)sipManager didReceiveLocalVideo:(RTCVideoTrack *)localView;

‎RestCommClient/Classes/RCDevice.h

+3
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ extern NSString* const RCDeviceCapabilityClientNameKey;
205205
*/
206206
- (BOOL) updateParams:(NSDictionary*)params;
207207

208+
// To be used internally by the library -not for application usage
209+
- (void)clearCurrentConnection;
210+
208211
/* DEBUG:
209212
-(void)startSofia;
210213
-(void)stopSofia;

‎RestCommClient/Classes/RCDevice.m

+5
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ - (void)unlisten
233233
[self.sipManager shutdown:NO];
234234
}
235235

236+
- (void)clearCurrentConnection
237+
{
238+
self.currentConnection = nil;
239+
}
240+
236241
+ (RCDeviceConnectivityType)networkStatus2ConnectivityType:(NetworkStatus)status
237242
{
238243
// right now those 2 enums are one to one, but let's keep the conversion in case the values change at some point

0 commit comments

Comments
 (0)