rdkartono/SIPIntercom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patches 20/11/2024

Browse Source
This commit is contained in:
rdkartono
2024-11-20 11:30:44 +07:00
parent f1285f4f14
commit 26579a8acf
8 changed files with 284 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Properties/config.properties Normal file
View File

@@ -0,0 +1,6 @@
WebUsername=admin
WebPassword=admin
WebListenPort = 8080
SipServer=100.64.0.3
SipUsername=100
SipPassword=12345678

2
SIPIntercom.iml
View File

@@ -5,6 +5,8 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/libs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/libs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Properties" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/WebContentt" isTestSource="false" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

48
src/Main.java
View File

@@ -1,21 +1,18 @@
import Webpage.WebServer;
import code.common;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.io.File; import java.io.File;
import java.text.MessageFormat; import java.text.MessageFormat;
import static code.common.currentDir;
public class Main { public class Main {
private static String serverAddress="100.64.0.3";
private static String Username="user1";
private static String Password="12345678";
private static jSIPClient client; private static jSIPClient client;
private static String currentDir; private static WebServer webserver;
public static void main(String[] args) { public static void main(String[] args) {
currentDir = System.getProperty("user.dir"); common.ExtractProperties(currentDir,"config.properties", false);
GetArguments(args);
Logger.info("Server Address: "+serverAddress);
Logger.info("Username: "+Username);
Logger.info("Password: "+Password);
// SIP Section
client = new jSIPClient(); client = new jSIPClient();
client.SetJavaSipEvent(new javaSipEvents() { client.SetJavaSipEvent(new javaSipEvents() {
@Override @Override
@@ -56,11 +53,22 @@ public class Main {
} }
}); });
ReconnectSIP(); ReconnectSIP();
// Web Server Section
webserver = new WebServer();
webserver.Start();
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
Logger.info("Shutting down SIPIntercom");
if (client!=null) client.Disconnect();
if (webserver!=null) webserver.Stop();
}));
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static void CallTest(String extension){ private static void CallTest(String extension){
String callnumber = MessageFormat.format("sip:{0}@{1}", extension, serverAddress); String callnumber = MessageFormat.format("sip:{0}@{1}", extension, client.getServerAddress());
if (client.Call(callnumber)){ if (client.Call(callnumber)){
Logger.info("Call to {} is successful",callnumber); Logger.info("Call to {} is successful",callnumber);
try{ try{
@@ -78,7 +86,7 @@ public class Main {
private static void StreamTest(String extension, String filename){ private static void StreamTest(String extension, String filename){
File ff = new File(currentDir, filename); File ff = new File(currentDir, filename);
if (ff.isFile()){ if (ff.isFile()){
String callnumber = MessageFormat.format("sip:{0}@{1}", extension, serverAddress); String callnumber = MessageFormat.format("sip:{0}@{1}", extension, client.getServerAddress());
if (client.StreamFile(callnumber, ff.getAbsolutePath())){ if (client.StreamFile(callnumber, ff.getAbsolutePath())){
Logger.info("Stream to {} is successful",callnumber); Logger.info("Stream to {} is successful",callnumber);
try{ try{
@@ -94,7 +102,7 @@ public class Main {
} }
private static void ReconnectSIP(){ private static void ReconnectSIP(){
if (client.Connect(serverAddress, Username, Password,"0.0.0.0")){ if (client.Connect()){
Logger.info("Connected to SIP Server"); Logger.info("Connected to SIP Server");
} }
else{ else{
@@ -107,19 +115,5 @@ public class Main {
} }
} }
private static void GetArguments(String[] args) {
if (args != null){
for(String a : args){
if (a.startsWith("--serverip=")){
serverAddress=a.substring(11);
}
else if (a.startsWith("--username=")){
Username=a.substring(11);
}
else if (a.startsWith("--password=")){
Password=a.substring(11);
}
}
}
}
} }

77
src/Webpage/WebServer.java Normal file
View File

@@ -0,0 +1,77 @@
package Webpage;
import code.common;
import io.javalin.Javalin;
import io.javalin.http.staticfiles.Location;
import java.util.Objects;
import java.util.Properties;
import static code.common.*;
public class WebServer {
private final Javalin app;
private final int listenport;
private final String webusername;
private final String webpassword;
public WebServer() {
Properties prop = common.LoadProperties(currentDir,"config.properties");
listenport = GetProperties_IntValue(prop,"WebListenPort", 8080);
webusername = GetProperties_StringValue(prop,"WebUsername", "admin");
webpassword = GetProperties_StringValue(prop,"WebPassword", "admin");
app = Javalin.create(config -> config.addStaticFiles("/public", Location.CLASSPATH)).start(listenport);
app.get("/", ctx ->{
if (Objects.equals(ctx.sessionAttribute("username"), webusername)){
ctx.redirect("/index.html");
} else {
ctx.sessionAttribute("username", null);
ctx.redirect("/login.html");
}
});
app.get("/logout", ctx -> {
ctx.sessionAttribute("username", null);
ctx.redirect("/login.html");
});
app.get("/setting", ctx -> {
if (Objects.equals(ctx.sessionAttribute("username"), webusername)){
//TODO Setting Page
ctx.result("Setting Page");
} else {
ctx.redirect("/login.html");
}
});
app.post("/login", ctx -> {
String username = ctx.formParam("username");
String password = ctx.formParam("password");
if (Objects.equals(username, webusername) && Objects.equals(password, webpassword)){
ctx.sessionAttribute("username", username);
ctx.redirect("/index.html");
} else {
ctx.redirect("/login.html");
}
});
app.post("/setting", ctx -> {
if (Objects.equals(ctx.sessionAttribute("username"), webusername)){
//TODO Setting Page
ctx.result("Setting Page");
} else {
ctx.redirect("/login.html");
}
});
}
/**
* Start the web server
*/
public void Start(){
if (app!=null) app.start(listenport);
}
/**
* Stop the web server
*/
public void Stop(){
if (app!=null) app.stop();
}
}

143
src/code/common.java Normal file
View File

@@ -0,0 +1,143 @@
package code;
import com.google.gson.Gson;
import com.sun.jna.Native;
import org.pmw.tinylog.Logger;
import peers.sip.syntaxencoding.SipHeaderFieldName;
import peers.sip.syntaxencoding.SipHeaderFieldValue;
import peers.sip.syntaxencoding.SipHeaders;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Properties;
public class common {
public static String currentDir = System.getProperty("user.dir");
public static Gson gson = new Gson();
public static String GetProperties_StringValue(Properties prop, String key, String defaultavalue){
if (prop!=null){
if (ValidString(key)){
return prop.getProperty(key,defaultavalue);
}
}
return defaultavalue;
}
public static int GetProperties_IntValue(Properties prop, String key, int defaultavalue){
if (prop!=null){
if (ValidString(key)){
return ParseInt(prop.getProperty(key),defaultavalue);
}
}
return defaultavalue;
}
/**
* Parse integer from string
* @param value string to parse
* @param defaultvalue default value if parsing failed
* @return parsed integer
*/
public static int ParseInt(String value, int defaultvalue){
try {
return Integer.parseInt(value);
} catch (Exception e) {
return defaultvalue;
}
}
/**
* Extract properties file from resource path
* @param directory destination directory
* @param filename destination filename
* @param overwrite overwrite if file already exists
*/
public static void ExtractProperties(String directory, String filename, boolean overwrite){
try{
File dest = new File(directory,filename);
if (dest.isFile() && !overwrite){
Logger.info("Properties file already exists: {}",filename);
return;
}
File source = Native.extractFromResourcePath(filename);
if (source==null){
Logger.error("Failed to extract properties file: {}",filename);
return;
}
if (source.renameTo(dest))
Logger.info("Extracted properties file: {}",filename);
else Logger.error("Failed to rename properties file: {}",filename);
} catch (Exception e) {
Logger.error("Failed to extract properties file: {}",filename);
}
}
/**
* Load properties file from directory
* @param directory destination directory
* @param filename destination filename
* @return properties object
*/
@SuppressWarnings("IOStreamConstructor")
public static Properties LoadProperties(String directory, String filename){
Properties prop = new Properties();
try {
File file = new File(directory,filename);
if (file.isFile()){
InputStream is = new FileInputStream(file);
prop.load(is);
is.close();
Logger.info("Loaded properties file: {}",filename);
} else Logger.info("Properties file not found: {}",filename);
} catch (Exception e) {
Logger.error("Failed to load properties file: {}",filename);
}
return prop;
}
/**
* Check if String is not null and have value
* @param value string to check
* @return true if string is not null and have value
*/
public static boolean ValidString(String value){
if (value!=null){
return !value.isEmpty();
}
return false;
}
/**
* Check if port number is valid
* @param value port number to check
* @return true if port number is valid
*/
public static boolean ValidPortNumber(int value){
return value>0 && value<65536;
}
/**
* Get SIP header value from SIP headers
* @param head SIP headers
* @param headername header name
* @param defaultvalue default value if header not found
* @return header value
*/
public static String GetSIPHeaderValue(SipHeaders head, String headername, String defaultvalue) {
if (head!=null) {
SipHeaderFieldName _fn = new SipHeaderFieldName(headername);
if (head.contains(_fn)) {
SipHeaderFieldValue _fv = head.get(_fn);
if (_fv!=null) {
return _fv.getValue();
}
}
}
return defaultvalue;
}
}

30
src/common.java
View File

@@ -1,30 +0,0 @@
import peers.sip.syntaxencoding.SipHeaderFieldName;
import peers.sip.syntaxencoding.SipHeaderFieldValue;
import peers.sip.syntaxencoding.SipHeaders;
public class common {
public static boolean ValidString(String value){
if (value!=null){
return !value.isEmpty();
}
return false;
}
public static boolean ValidPortNumber(int value){
return value>0 && value<65536;
}
public static String GetSIPHeaderValue(SipHeaders head, String headername) {
if (head!=null) {
SipHeaderFieldName _fn = new SipHeaderFieldName(headername);
if (head.contains(_fn)) {
SipHeaderFieldValue _fv = head.get(_fn);
if (_fv!=null) {
return _fv.getValue();
}
}
}
return null;
}
}

72
src/jSIPClient.java
View File

@@ -1,12 +1,11 @@
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.SocketException; import java.net.SocketException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Properties;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@@ -14,10 +13,8 @@ import Audio.BassFileReader;
import Audio.BassFileReaderListener; import Audio.BassFileReaderListener;
import Audio.BassSoundManager; import Audio.BassSoundManager;
import Audio.BassSoundManagerListener; import Audio.BassSoundManagerListener;
import com.google.gson.Gson; import code.common;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonIOException; import com.google.gson.JsonIOException;
import com.google.gson.JsonSyntaxException;
import lombok.Getter; import lombok.Getter;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
@@ -35,13 +32,12 @@ import peers.sip.transactionuser.DialogManager;
import peers.sip.transport.SipRequest; import peers.sip.transport.SipRequest;
import peers.sip.transport.SipResponse; import peers.sip.transport.SipResponse;
import static code.common.*;
@SuppressWarnings({"unused", "UnusedReturnValue"}) @SuppressWarnings({"unused", "UnusedReturnValue"})
public class jSIPClient { public class jSIPClient {
public jSIPClient() { public jSIPClient() {
gs = new GsonBuilder()
.setPrettyPrinting()
.create();
runningfolder = new File("").getAbsolutePath(); runningfolder = new File("").getAbsolutePath();
load_config(); load_config();
Runtime.getRuntime().addShutdownHook(new Thread(() -> { Runtime.getRuntime().addShutdownHook(new Thread(() -> {
@@ -52,10 +48,13 @@ public class jSIPClient {
})); }));
} }
@Getter private String serverAddress;
@Getter private String Username;
@Getter private String Password;
public CustomConfig cc = new CustomConfig(); public CustomConfig cc = new CustomConfig();
private EventManager em; private EventManager em;
private final Gson gs;
private final String runningfolder; private final String runningfolder;
@@ -68,22 +67,17 @@ public class jSIPClient {
/** /**
* Connect to SIP Server * Connect to SIP Server
* @param serverip SIP Server IP
* @param username Username to register
* @param password Password to register
* @param localip use if need to specify which Network Adapter to use
* @return true if parameter completed * @return true if parameter completed
*/ */
public boolean Connect(String serverip, String username, String password, String localip) { public boolean Connect() {
Disconnect(); Disconnect();
if (cc==null) { if (cc==null) {
System.out.println("Creating Custom Config"); System.out.println("Creating Custom Config");
cc = new CustomConfig(); cc = new CustomConfig();
} else System.out.println("Custom Config already created"); } else System.out.println("Custom Config already created");
if (common.ValidString(serverip)) cc.setDomain(serverip); cc.setDomain(serverAddress);
if (common.ValidString(username)) cc.setUserPart(username); cc.setUserPart(Username);
if (common.ValidString(password)) cc.setPassword(password); cc.setPassword(Password);
if (common.ValidString(localip)) cc.SetLocalInetAddress(localip);
em = new EventManager(cc); em = new EventManager(cc);
return false; return false;
@@ -537,7 +531,7 @@ public class jSIPClient {
@Override @Override
public void error(SipResponse sipResponse) { public void error(SipResponse sipResponse) {
raise_log_event("sip error, response="+gs.toJson(sipResponse)); raise_log_event("sip error, response="+common.gson.toJson(sipResponse));
} }
@@ -555,10 +549,10 @@ public class jSIPClient {
req = source; req = source;
if (req!=null) { if (req!=null) {
SipHeaders head = source.getSipHeaders(); SipHeaders head = source.getSipHeaders();
this.To = common.GetSIPHeaderValue(head,"To"); this.To = common.GetSIPHeaderValue(head,"To", null);
this.From = common.GetSIPHeaderValue(head, "From"); this.From = common.GetSIPHeaderValue(head, "From", null);
this.CallID = common.GetSIPHeaderValue(head, "Call-ID"); this.CallID = common.GetSIPHeaderValue(head, "Call-ID", null);
this.Contact = common.GetSIPHeaderValue(head, "Contact"); this.Contact = common.GetSIPHeaderValue(head, "Contact", null);
} }
} }
@@ -578,12 +572,12 @@ public class jSIPClient {
this.statusCode = source.getStatusCode(); this.statusCode = source.getStatusCode();
this.reasonPhrase = source.getReasonPhrase(); this.reasonPhrase = source.getReasonPhrase();
SipHeaders head = source.getSipHeaders(); SipHeaders head = source.getSipHeaders();
this.To = common.GetSIPHeaderValue(head, "To"); this.To = common.GetSIPHeaderValue(head, "To", null);
this.From = common.GetSIPHeaderValue(head, "From"); this.From = common.GetSIPHeaderValue(head, "From", null);
this.CallID = common.GetSIPHeaderValue(head, "Call-ID"); this.CallID = common.GetSIPHeaderValue(head, "Call-ID", null);
this.Contact = common.GetSIPHeaderValue(head, "Contact"); this.Contact = common.GetSIPHeaderValue(head, "Contact", null);
this.Server = common.GetSIPHeaderValue(head, "Server"); this.Server = common.GetSIPHeaderValue(head, "Server", null);
this.Date = common.GetSIPHeaderValue(head, "Date"); this.Date = common.GetSIPHeaderValue(head, "Date", null);
} }
} }
private @Getter final SipResponse resp; private @Getter final SipResponse resp;
@@ -974,7 +968,7 @@ public class jSIPClient {
private void save_config() { private void save_config() {
if (cc!=null) { if (cc!=null) {
try { try {
gs.toJson(cc, new FileWriter(new File(runningfolder,"Config.json"))); common.gson.toJson(cc, new FileWriter(new File(runningfolder,"Config.json")));
raise_log_event("Config.json saved"); raise_log_event("Config.json saved");
} catch (JsonIOException | IOException e) { } catch (JsonIOException | IOException e) {
raise_log_event("save_config failed, exception = "+e.getMessage()); raise_log_event("save_config failed, exception = "+e.getMessage());
@@ -982,17 +976,13 @@ public class jSIPClient {
} }
} }
/**
* Dipanggil saat initialization
*/
private void load_config(){ private void load_config(){
try { Properties prop = LoadProperties(currentDir,"config.properties");
CustomConfig xx = gs.fromJson(new FileReader(new File(runningfolder,"Config.json")), CustomConfig.class); serverAddress = GetProperties_StringValue(prop,"SipServer","100.64.0.3");
raise_log_event("Config.json loaded"); Username = GetProperties_StringValue(prop,"SipUsername","user1");
cc = xx; Password = GetProperties_StringValue(prop,"SipPassword","12345678");
} catch (JsonSyntaxException | JsonIOException | FileNotFoundException e) { Logger.info("SipServer: "+serverAddress);
raise_log_event("load_config failed, exception = "+e.getMessage()); Logger.info("SipUsername: "+Username);
} Logger.info("SipPassword: "+Password);
} }
} }

2
src/peers/sip/core/useragent/handlers/RegisterHandler.java
View File

@@ -72,7 +72,7 @@ public class RegisterHandler extends MethodHandler
super(userAgent, transactionManager, transportManager); super(userAgent, transactionManager, transportManager);
} }
//TODO factorize common code here and in invitehandler //TODO factorize code.common code here and in invitehandler
public synchronized ClientTransaction preProcessRegister(SipRequest sipRequest) public synchronized ClientTransaction preProcessRegister(SipRequest sipRequest)
throws SipUriSyntaxException { throws SipUriSyntaxException {
registered = false; registered = false;