Skip to content

Commit 9a945cb

Browse files
atsakiridisatsakiridis
committed
Use Always On instead of separate dedicated instance. Trivial fixes
1 parent 96d6a9e commit 9a945cb

File tree

7 files changed

+59
-28
lines changed

7 files changed

+59
-28
lines changed

‎RestCommClient/RestCommClient/CliInterface/ssc_sip.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ ssc_t *ssc_create(su_home_t *home, su_root_t *root, const ssc_conf_t *conf, cons
211211
contact = conf->ssc_contact;
212212
else
213213
contact = "sip:*:5090;transport=tcp";
214+
//contact = "sip:*:5090;transport=tcp";
214215

215216
/* step: launch the SIP stack */
216217
ssc->ssc_nua = nua_create(root,

‎Samples/restcomm-helloworld/restcomm-helloworld/Base.lproj/Main_iPad.storyboard

+27-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
33
<dependencies>
44
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
6+
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
67
</dependencies>
78
<scenes>
89
<!--RestComm Client-->
@@ -17,28 +18,44 @@
1718
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
1819
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1920
<subviews>
20-
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DEU-Hh-53C">
21-
<rect key="frame" x="445" y="858" width="227" height="76"/>
21+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Rv-tN-wXu">
22+
<rect key="frame" x="64" y="858" width="270" height="76"/>
23+
<color key="backgroundColor" red="0.87566179040000003" green="0.8756355643" blue="0.87565040589999998" alpha="1" colorSpace="calibratedRGB"/>
24+
<constraints>
25+
<constraint firstAttribute="height" constant="76" id="Fmk-lz-FDf"/>
26+
<constraint firstAttribute="width" constant="270" id="V2Q-MD-fq1"/>
27+
</constraints>
2228
<fontDescription key="fontDescription" type="system" pointSize="50"/>
23-
<state key="normal" title="Hang up">
29+
<state key="normal" title="Dial">
2430
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
2531
</state>
2632
<connections>
27-
<action selector="hangUpPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Oys-zl-Tt0"/>
33+
<action selector="dialPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QAk-OV-VPF"/>
2834
</connections>
2935
</button>
30-
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Rv-tN-wXu">
31-
<rect key="frame" x="96" y="858" width="116" height="76"/>
36+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DEU-Hh-53C">
37+
<rect key="frame" x="434" y="858" width="270" height="76"/>
38+
<color key="backgroundColor" red="0.87566179040000003" green="0.8756355643" blue="0.87565040589999998" alpha="1" colorSpace="calibratedRGB"/>
39+
<constraints>
40+
<constraint firstAttribute="width" constant="270" id="WbO-wa-xRt"/>
41+
<constraint firstAttribute="height" constant="76" id="nwL-TP-hT2"/>
42+
</constraints>
3243
<fontDescription key="fontDescription" type="system" pointSize="50"/>
33-
<state key="normal" title="Dial">
44+
<state key="normal" title="Hang up">
3445
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
3546
</state>
3647
<connections>
37-
<action selector="dialPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QAk-OV-VPF"/>
48+
<action selector="hangUpPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Oys-zl-Tt0"/>
3849
</connections>
3950
</button>
4051
</subviews>
4152
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
53+
<constraints>
54+
<constraint firstItem="2Rv-tN-wXu" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="44" id="B0s-nb-Rsg"/>
55+
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="DEU-Hh-53C" secondAttribute="bottom" constant="90" id="PkN-PD-KLu"/>
56+
<constraint firstAttribute="trailingMargin" secondItem="DEU-Hh-53C" secondAttribute="trailing" constant="44" id="aq3-uF-dRA"/>
57+
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="2Rv-tN-wXu" secondAttribute="bottom" constant="90" id="hvI-iM-TSW"/>
58+
</constraints>
4259
</view>
4360
<tabBarItem key="tabBarItem" title="RestComm Client" id="C2i-Za-EiQ"/>
4461
</viewController>

‎Samples/restcomm-helloworld/restcomm-helloworld/Base.lproj/Main_iPhone.storyboard

+19-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
33
<dependencies>
44
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
6+
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
67
</dependencies>
78
<scenes>
89
<!--RestComm Client-->
@@ -17,8 +18,13 @@
1718
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
1819
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
1920
<subviews>
20-
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="erB-03-wsH">
21-
<rect key="frame" x="31" y="501" width="66" height="45"/>
21+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="erB-03-wsH">
22+
<rect key="frame" x="21" y="501" width="120" height="45"/>
23+
<color key="backgroundColor" red="0.87566179040000003" green="0.8756355643" blue="0.87565040589999998" alpha="1" colorSpace="calibratedRGB"/>
24+
<constraints>
25+
<constraint firstAttribute="width" constant="120" id="8K9-P5-6Qf"/>
26+
<constraint firstAttribute="height" constant="45" id="ehM-kn-9nK"/>
27+
</constraints>
2228
<fontDescription key="fontDescription" type="system" pointSize="25"/>
2329
<state key="normal" title="Dial">
2430
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -27,8 +33,13 @@
2733
<action selector="dialPressed:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="kFl-Bb-N2Y"/>
2834
</connections>
2935
</button>
30-
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nyi-ak-3Ea">
31-
<rect key="frame" x="169" y="501" width="120" height="45"/>
36+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nyi-ak-3Ea">
37+
<rect key="frame" x="179" y="501" width="120" height="45"/>
38+
<color key="backgroundColor" red="0.87566179040000003" green="0.8756355643" blue="0.87565040589999998" alpha="1" colorSpace="calibratedRGB"/>
39+
<constraints>
40+
<constraint firstAttribute="height" constant="45" id="eQW-VJ-Wzf"/>
41+
<constraint firstAttribute="width" constant="120" id="qzG-hs-15v"/>
42+
</constraints>
3243
<fontDescription key="fontDescription" type="system" pointSize="25"/>
3344
<state key="normal" title="Hang up">
3445
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -40,7 +51,9 @@
4051
</subviews>
4152
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
4253
<constraints>
54+
<constraint firstItem="erB-03-wsH" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="5" id="AVf-yy-sH6"/>
4355
<constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="Nyi-ak-3Ea" secondAttribute="bottom" constant="22" id="Sn7-ir-fm3"/>
56+
<constraint firstAttribute="trailingMargin" secondItem="Nyi-ak-3Ea" secondAttribute="trailing" constant="5" id="Tv2-1J-F5r"/>
4457
<constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="erB-03-wsH" secondAttribute="bottom" constant="22" id="mi9-de-w5a"/>
4558
</constraints>
4659
</view>

‎Samples/restcomm-helloworld/restcomm-helloworld/ViewController.mm

+8-8
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ - (void)viewDidLoad
4242
nil];
4343

4444
// CHANGEME: set the IP address of your RestComm instance in the URI below
45-
[self.parameters setObject:@"sip:54.225.212.193:5080" forKey:@"registrar"];
45+
[self.parameters setObject:@"sip:23.23.228.238:5080" forKey:@"registrar"];
4646

4747
// initialize RestComm Client by setting up an RCDevice
4848
self.device = [[RCDevice alloc] initWithParams:self.parameters delegate:self];
@@ -53,12 +53,6 @@ - (void)viewDidLoad
5353
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(unregister:) name:UIApplicationWillResignActiveNotification object:nil];
5454
}
5555

56-
- (void)didReceiveMemoryWarning
57-
{
58-
[super didReceiveMemoryWarning];
59-
// Dispose of any resources that can be recreated.
60-
}
61-
6256
// ---------- UI events
6357
- (IBAction)dialPressed:(id)sender
6458
{
@@ -69,7 +63,7 @@ - (IBAction)dialPressed:(id)sender
6963

7064
// CHANGEME: set the number of the RestComm Application you wish to contact (currently we are using '1235',
7165
// which is the Hello World RestComm Application). Also set the ip address for your RestComm instance
72-
[self.parameters setObject:@"sip:1235@54.225.212.193:5080" forKey:@"username"];
66+
[self.parameters setObject:@"sip:1235@23.23.228.238:5080" forKey:@"username"];
7367

7468
// call the other party
7569
self.connection = [self.device connect:self.parameters delegate:self];
@@ -167,6 +161,12 @@ - (void)connectionDidDisconnect:(RCConnection*)connection
167161
self.connection = nil;
168162
}
169163

164+
- (void)didReceiveMemoryWarning
165+
{
166+
[super didReceiveMemoryWarning];
167+
// Dispose of any resources that can be recreated.
168+
}
169+
170170
- (BOOL)shouldAutorotate
171171
{
172172
return YES;

‎Samples/restcomm-messenger/restcomm-messenger/CallViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@
3636
@end
3737

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

‎Samples/restcomm-messenger/restcomm-messenger/SettingsViewController.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
char AOR[] = "sip:[email protected]";
2727
// elastic
28-
char REGISTRAR[] = "54.225.212.193:5080";
28+
char REGISTRAR[] = "23.23.228.238:5080";
2929
//char REGISTRAR[] = "192.168.2.32:5080";
3030

3131

‎Samples/restcomm-messenger/restcomm-messenger/ViewController.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ - (void)viewDidLoad
6969
[self.view addGestureRecognizer:tapGesture];
7070
#ifdef DEBUG
7171
// set some defaults when in debug to avoid typing
72-
self.sipUriText.text = @"sip:1235@54.225.212.193:5080";
72+
self.sipUriText.text = @"sip:1235@23.23.228.238:5080";
7373
//self.sipUriText.text = @"sip:[email protected]:5080";
7474
#else
75-
self.sipUriText.text = @"sip:1235@54.225.212.193:5080";
75+
self.sipUriText.text = @"sip:1235@23.23.228.238:5080";
7676
#endif
7777

7878
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(register:) name:UIApplicationDidBecomeActiveNotification object:nil];

0 commit comments

Comments
 (0)