NekoCWD/singularity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

WIP
All checks were successful
PostmarketOS Build / Prepare (push) Successful in 5s
Details
PostmarketOS Build / Build for aarch64 (push) Successful in 39s
Details
PostmarketOS Build / Build for x86_64 (push) Successful in 13s
Details

Browse source 
Signed-off-by: Vasiliy Doylov <nekocwd@mainlining.org>
This commit is contained in:
Vasiliy Doylov 2025-06-22 01:39:08 +03:00
parent 00bf38752f
commit 44e2a90336
Signed by: NekoCWD
GPG key ID: B7BE22D44474A582
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/logic/outbounds/trojan.vala
View file

@ -27,9 +27,9 @@ class Singularity.Outbound.Trojan : Dial, Json.Serializable {
public int64 server_port { get; set; default = 1080; } public int64 server_port { get; set; default = 1080; }
public string password { get; set; default = null; } public string password { get; set; default = null; }
public string network { get; set; default = null; } public string network { get; set; default = null; }
public Transport.Transport transport { owned get; owned set; default = null; } public Transport.Transport transport { get; set; default = null; }
public TLS tls { owned get; owned set; default = null; } public TLS tls { get; set; default = null; }
/* /*
* public Multiplex multiplex { get; set; default = null; } * public Multiplex multiplex { get; set; default = null; }
* TODO: Implement Multiplex * TODO: Implement Multiplex
@ -42,8 +42,8 @@ class Singularity.Outbound.Trojan : Dial, Json.Serializable {
public override Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec) { public override Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec) {
var node = default_serialize_property (property_name, value, pspec); var node = default_serialize_property (property_name, value, pspec);
if (property_name == "transport" && transport != null) { if (property_name == "transport" && transport != null) {
// Utils.fix_type (ref node); Utils.fix_type (ref node);
// Utils.fix_dash (ref node); Utils.fix_dash (ref node);
} }
if (property_name == "tls" && tls != null) { if (property_name == "tls" && tls != null) {
Utils.fix_dash (ref node); Utils.fix_dash (ref node);

4
src/logic/outbounds/vless.vala
View file

@ -29,8 +29,8 @@ class Singularity.Outbound.Vless : Dial, Json.Serializable {
public string flow { get; set; default = null; } public string flow { get; set; default = null; }
public string network { get; set; default = null; } public string network { get; set; default = null; }
public TLS tls { get; set; default = null; } public TLS tls { get; set; default = null; }
public string packet_encoding { owned get; owned set; default = null; } public string packet_encoding { get; set; default = null; }
public Transport.Transport transport { owned get; owned set; default = null; } public Transport.Transport transport { get; set; default = null; }
/* /*
* public Multiplex multiplex { get; set; default = null; } * public Multiplex multiplex { get; set; default = null; }
* TODO: Implement Multiplex * TODO: Implement Multiplex

4
src/logic/utils.vala
View file

@ -48,11 +48,11 @@ namespace Singularity.Utils {
var obj = node.get_object(); var obj = node.get_object();
if (obj.has_member(TYPE_NAME_SRC)) { if (obj.has_member(TYPE_NAME_SRC)) {
var type_name = obj.get_member(TYPE_NAME_SRC); var type_name = obj.get_member(TYPE_NAME_SRC).copy();
obj.set_member(TYPE_NAME_DST, type_name); obj.set_member(TYPE_NAME_DST, type_name);
obj.remove_member(TYPE_NAME_SRC); obj.remove_member(TYPE_NAME_SRC);
} else if (obj.has_member(TYPE_NAME_DST)) { } else if (obj.has_member(TYPE_NAME_DST)) {
var type_name = obj.get_member(TYPE_NAME_DST); var type_name = obj.get_member(TYPE_NAME_DST).copy();
obj.set_member(TYPE_NAME_SRC, type_name); obj.set_member(TYPE_NAME_SRC, type_name);
obj.remove_member(TYPE_NAME_DST); obj.remove_member(TYPE_NAME_DST);
} else { } else {