Skip to content

delete SmsSetCache by targetID on SS7 CLI #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
denizkilic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

delete SmsSetCache by targetID on SS7 CLI #309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions core/domain/src/main/java/org/mobicents/smsc/domain/SMSCShellExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import javolution.util.FastMap;

import org.apache.log4j.Logger;
import org.mobicents.smsc.library.SmsSet;
import org.restcomm.protocols.ss7.indicator.GlobalTitleIndicator;
import org.restcomm.protocols.ss7.map.api.MAPApplicationContextVersion;
import org.restcomm.protocols.ss7.map.api.errors.SMEnumeratedDeliveryFailureCause;
Expand Down Expand Up @@ -592,6 +593,10 @@ private String executeSmsc(String[] args) {
return this.updateCcMccmnstable(args);
} else if (args[1].toLowerCase().equals("hrccmccmnc")) {
return this.ccMccmnsValueUpdate(args);
} else if (args[1].toLowerCase().equals("deletesmsset")) {
if (args.length < 3)
return SMSCOAMMessages.INVALID_COMMAND;
return this.deleteSmsSets(Arrays.copyOfRange(args, 2, args.length));
}

return SMSCOAMMessages.INVALID_COMMAND;
Expand All @@ -601,6 +606,32 @@ private String executeSmsc(String[] args) {
}
}

/**
* Delete all SMS sets for specified targetIds from SmsSetCache
* @param targetIds
* @return
*/
private String deleteSmsSets(String[] targetIds) {
SmsSetCache smsSetCache = SmsSetCache.getInstance();
StringBuilder report = new StringBuilder();
report.append("SmsSetCache size: ").append(smsSetCache.getProcessingSmsSetSize());
report.append("\nDeleting message sets:");
for (String targetId: targetIds) {
SmsSet deletedSmsSet = smsSetCache.removeProcessingSmsSet(targetId);
if (deletedSmsSet == null) {
report.append("\n\tno messages for targetId=").append(targetId);
} else {
report.append("\n\tmessage deleted: ").append(formatSmsSet(deletedSmsSet));
}
}
return report.toString();
}


private String formatSmsSet(SmsSet smsSet) {
return String.format("SMS targetId=%s, destAdd=%s, count=%d", smsSet.getTargetId(), smsSet.getDestAddr(), smsSet.getSmsCount());
}

/**
* smsc mapcache get <msisdn>
*
Expand Down