captrace checkin

This commit is contained in:
2023-09-01 11:25:15 +08:00
parent 95591c1753
commit ddcc356d08
9 changed files with 836 additions and 7 deletions

BIN
captrace/captrace.exe Normal file

Binary file not shown.

636
captrace/captrace.go Normal file
View File

@@ -0,0 +1,636 @@
package main
import (
"encoding/binary"
"encoding/hex"
"fmt"
"net"
"os"
"os/exec"
"strings"
"sync"
"ems.agt/captrace/config"
"ems.agt/lib/dborm"
"ems.agt/lib/global"
"ems.agt/lib/log"
_ "github.com/go-sql-driver/mysql"
"golang.org/x/net/http/httpguts"
"golang.org/x/net/http2/hpack"
)
// goroutine
var limitChan = make(chan bool, 1024)
const (
GTPU_V1_VERSION = 1 << 5
GTPU_VER_MASK = 7 << 5
GTPU_PT_GTP = 1 << 4
GTPU_HEADER_LEN = 12
GTPU_E_S_PB_BIT = 7
GTPU_E_BI = 1 << 2
)
const (
GTPU_HEADER_VERSION_INDEX = 0
GTPU_HEADER_MSG_TYPE_INDEX = 1
GTPU_HEADER_LENGTH_INDEX = 2
GTPU_HEADER_TEID_INDEX = 4
)
type ExtHeader struct {
TaskId uint32
IMSI string
IfType byte
MsgType byte
MsgDirect byte // 0-recv,1-send
TimeStamp int64
SrcIP string
DstIP string
SrcPort uint16
DstPort uint16
Proto int
PPI int // only for SCTP
DataLen uint16
DataInfo []byte
}
type MsgInfo struct {
TaskId uint32
TimeStamp int64
IfType byte
MsgType byte
MsgDirect byte
SrcAddr string // IP:Port
DstAddr string // IP:Port
}
// func (fr *Framer) ReadFrame() (Frame, error)
// ReadMetaHeaders *hpack.Decoder
func validWireHeaderFieldName(v string) bool {
if len(v) == 0 {
return false
}
for _, r := range v {
if !httpguts.IsTokenRune(r) {
return false
}
if 'A' <= r && r <= 'Z' {
return false
}
}
return true
}
// tshark -r gtp.pcap -T json -d tcp.port==8080,http2 -Y "http2"
// -T pdml: Packet Details Markup Language
// -T psml: Packet Summary Markup Language
func execTshark(filename string, proto string) {
pcapPath := filename
tshark := exec.Command("tshark", "-r"+pcapPath,
"-Y"+proto,
"-T", "pdml")
out, err := tshark.CombinedOutput()
if err != nil {
log.Errorf("Failed to exec tshark:", err)
} else {
log.Debug("combined out:", string(out))
}
}
const magicMicroseconds = 0xa1b2c3d4
const versionMajor = 2
const versionMinor = 4
func WriteEmptyPcap(filename string, timestamp int64, length int, data []byte) error {
var cooked = [...]byte{0x00, 0x00, 0x03, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00}
var buf []byte
//24+16+16 = 56
buf = make([]byte, 56+length)
binary.LittleEndian.PutUint32(buf[0:4], magicMicroseconds)
binary.LittleEndian.PutUint16(buf[4:6], versionMajor)
binary.LittleEndian.PutUint16(buf[6:8], versionMinor)
// bytes 8:12 stay 0 (timezone = UTC)
// bytes 12:16 stay 0 (sigfigs is always set to zero, according to
// http://wiki.wireshark.org/Development/LibpcapFileFormat
binary.LittleEndian.PutUint32(buf[16:20], 0x00040000)
binary.LittleEndian.PutUint32(buf[20:24], 0x00000071)
// Packet Header
binary.LittleEndian.PutUint64(buf[24:32], uint64(timestamp))
binary.LittleEndian.PutUint32(buf[32:36], uint32(length+16))
binary.LittleEndian.PutUint32(buf[36:40], uint32(length+16))
copy(buf[40:], cooked[:])
copy(buf[56:], data[:])
err := os.WriteFile(filename, buf[:], 0644)
//log.Debugf("CAP: %v\n", buf)
return err
}
func ngapDataHandle(emsg []byte, timestamp int64, data []byte) int {
filePath := fmt.Sprintf("/tmp/ng%d.pcap", timestamp)
err := WriteEmptyPcap(filePath, timestamp, len(data), data)
if err != nil {
log.Error("Failed to tshark:", err)
return -1
} else {
execTshark(filePath, "ngap")
}
return 0
}
func pfcpDataHandle(emsg []byte, timestamp int64, data []byte) int {
filePath := fmt.Sprintf("/tmp/pf%d.pcap", timestamp)
err := WriteEmptyPcap(filePath, timestamp, len(data), data)
if err != nil {
log.Error("Failed to tshark:", err)
} else {
execTshark(filePath, "pfcp")
}
return 0
}
func httpDataHandle(emsg []byte, timestamp int64, data []byte) int {
filePath := fmt.Sprintf("/tmp/sb%d.pcap", timestamp)
err := WriteEmptyPcap(filePath, timestamp, len(data), data)
if err != nil {
log.Error("Failed to tshark:", err)
} else {
execTshark(filePath, "http2")
}
return 0
}
func httpHeaderDataHandle(emsg []byte, header []byte, data []byte) int {
var remainSize = uint32(16 << 20)
var sawRegular bool
var invalid bool // pseudo header field errors
var Fields []hpack.HeaderField
invalid = false
hdec := hpack.NewDecoder(4096, nil)
hdec.SetEmitEnabled(true)
hdec.SetMaxStringLength(int(16 << 20))
hdec.SetEmitFunc(func(hf hpack.HeaderField) {
if !httpguts.ValidHeaderFieldValue(hf.Value) {
// Don't include the value in the error, because it may be sensitive.
invalid = true
}
isPseudo := strings.HasPrefix(hf.Name, ":")
if isPseudo {
if sawRegular {
invalid = true
}
} else {
sawRegular = true
if !validWireHeaderFieldName(hf.Name) {
invalid = true
}
}
if invalid == true {
hdec.SetEmitEnabled(false)
return
}
size := hf.Size()
if size > remainSize {
hdec.SetEmitEnabled(false)
//mh.Truncated = true
return
}
remainSize -= size
Fields = append(Fields, hf)
})
// defer hdec.SetEmitFunc(func(hf hpack.HeaderField) {})
frag := header
if _, err := hdec.Write(frag); err != nil {
return -1
}
if err := hdec.Close(); err != nil {
return -1
}
hdec.SetEmitFunc(func(hf hpack.HeaderField) {})
var headers []byte
var line string
for i := range Fields {
line = fmt.Sprintf("\"%s\":\"%s\",", Fields[i].Name, Fields[i].Value)
headers = append(headers, []byte(line)...)
}
if data != nil && len(data) > 0 {
encode := fmt.Sprintf("%s \"content\":%s\n", string(headers), string(data))
emsg = append(emsg, []byte(encode)...)
log.Debug("encode:", string(encode))
} else {
log.Debug("headers:", string(headers))
emsg = append(emsg, []byte(headers)...)
}
return 0
}
func gtpuHandler(rvMsg []byte, rvLen int) {
var extHdr ExtHeader
var tr dborm.TraceData
var off, ret int
msg := rvMsg
verFlags := msg[GTPU_HEADER_VERSION_INDEX]
gtpuHdrLen := GTPU_HEADER_LEN
localTeid := binary.BigEndian.Uint32(msg[GTPU_HEADER_TEID_INDEX:])
extHdr.TaskId = localTeid
if (verFlags & GTPU_E_S_PB_BIT) != 0 {
if (verFlags & GTPU_E_BI) != 0 {
extTypeIndex := GTPU_HEADER_LEN - 1
extType := msg[extTypeIndex]
if extType == 0xFE {
extHdr.IMSI = string(msg[extTypeIndex+2 : extTypeIndex+17])
extHdr.IfType = msg[extTypeIndex+17]
extHdr.MsgType = msg[extTypeIndex+18]
extHdr.MsgDirect = msg[extTypeIndex+19]
extHdr.TimeStamp = int64(binary.BigEndian.Uint64(msg[extTypeIndex+19:]))
log.Debugf("ext info %v %s %d %d %d", msg[(extTypeIndex+2):(extTypeIndex+20)], extHdr.IMSI, extHdr.IfType, extHdr.MsgType, extHdr.MsgDirect)
// set offset of IP Packet
off = 40 + 4
//src ip: msg+40+12
extHdr.SrcIP = fmt.Sprintf("%d.%d.%d.%d", msg[off+12], msg[off+13], msg[off+14], msg[off+15])
//dst ip: msg+40+12+4
extHdr.DstIP = fmt.Sprintf("%d.%d.%d.%d", msg[off+16], msg[off+17], msg[off+18], msg[off+19])
extHdr.SrcPort = uint16(binary.BigEndian.Uint16(msg[off+20:]))
extHdr.DstPort = uint16(binary.BigEndian.Uint16(msg[off+22:]))
log.Debugf("info %s:%d %s:%d", extHdr.SrcIP, extHdr.SrcPort, extHdr.DstIP, extHdr.DstPort)
// ip header start msg+40
tr.TaskID = int(extHdr.TaskId)
tr.Timestamp = extHdr.TimeStamp
tr.Imsi = extHdr.IMSI
tr.IfType = int(extHdr.IfType)
tr.SrcAddr = fmt.Sprintf("%s:%d", extHdr.SrcIP, extHdr.SrcPort)
tr.DstAddr = fmt.Sprintf("%s:%d", extHdr.DstIP, extHdr.DstPort)
tr.MsgType = int(extHdr.MsgType)
tr.MsgDirect = int(extHdr.MsgDirect)
tr.RawMsg = make([]byte, int(rvLen-off))
copy(tr.RawMsg, []byte(msg[off:]))
extHdr.Proto = int(msg[off+9])
if extHdr.Proto == 132 { //SCTP
extHdr.PPI = int(msg[off+47])
extHdr.DataLen = uint16(binary.BigEndian.Uint16(msg[(off+34):]) - 16)
log.Debugf("dat len %d %d", extHdr.DataLen, extHdr.PPI)
if extHdr.PPI == 60 { // NGAP
extHdr.DataInfo = make([]byte, extHdr.DataLen)
copy(extHdr.DataInfo, msg[(off+48):])
//append(extHdr.DataInfo, msg[88:]...)
log.Debugf("dataInfo %v", extHdr.DataInfo)
ret = ngapDataHandle([]byte(tr.DecMsg), tr.Timestamp, tr.RawMsg)
}
} else if extHdr.Proto == 6 { // TCP
iplen := uint16(binary.BigEndian.Uint16(msg[off+2:]))
tcplen := uint16(iplen - 32 - 20)
hdrlen := uint16(binary.BigEndian.Uint16(msg[off+20+32+1:]))
offset := uint16(off + 52)
log.Debugf("HTTP %d %d %d\n", iplen, tcplen, hdrlen)
extHdr.DataLen = tcplen
extHdr.DataInfo = make([]byte, extHdr.DataLen)
copy(extHdr.DataInfo, msg[offset:])
//ret = httpDataHandle(tr.DecodedMsg, tr.Timestamp, tr.RawMsg)
if tcplen > (hdrlen + 9) { // has data
doffset := uint16(offset + hdrlen + 9)
datlen := uint16(binary.BigEndian.Uint16(msg[doffset+1:]))
log.Debugf("HTTP datlen %d", datlen)
ret = httpHeaderDataHandle([]byte(tr.DecMsg), msg[offset+9:offset+9+hdrlen], msg[doffset+9:doffset+datlen+9])
} else {
ret = httpHeaderDataHandle([]byte(tr.DecMsg), msg[offset+9:hdrlen], nil)
}
} else if extHdr.Proto == 17 { // UDP
ilen := uint16(binary.BigEndian.Uint16(msg[off+2:]))
udplen := uint16(ilen - 20)
extHdr.DataLen = udplen - 8
extHdr.DataInfo = make([]byte, extHdr.DataLen)
copy(extHdr.DataInfo, msg[off+27:])
ret = pfcpDataHandle([]byte(tr.DecMsg), tr.Timestamp, tr.RawMsg)
}
if ret < 0 {
log.Error("Decode message error")
} else {
PutTraceRecordToDB(&tr)
}
}
for extType != 0 && extTypeIndex < rvLen {
extLen := msg[extTypeIndex+1] << 2
if extLen == 0 {
log.Error("error, extLen is zero")
return
}
gtpuHdrLen += int(extLen)
extTypeIndex += int(extLen)
extType = msg[extTypeIndex]
}
}
} else {
gtpuHdrLen -= 4
}
}
func udpProcess(conn *net.UDPConn) {
data := make([]byte, 2048)
n, _, err := conn.ReadFromUDP(data)
if err != nil {
log.Error("failed read udp msg, error: " + err.Error())
}
gtpuHandler(data, n)
//str := string(data[:n])
//log.Error("receive from client, data:" + str)
<-limitChan
}
func udpServer(address string) {
udpAddr, err := net.ResolveUDPAddr("udp", address)
if err != nil {
log.Error("Failed to ResolveUDPAddr:", err)
os.Exit(1)
}
conn, err := net.ListenUDP("udp", udpAddr)
if err != nil {
log.Error("read from connect failed, err:", err)
os.Exit(1)
}
defer conn.Close()
for {
limitChan <- true
go udpProcess(conn)
}
}
//SCTP OFFSET = 48
//HTTP2 OFFSET = 52
//UDP OFFSET = 28
func PutTraceRecordToDB(tr *dborm.TraceData) error {
var offset, ret int
if tr.IfType == 1 || tr.IfType == 2 { // SCTP
offset = 48
ret = ngapDataHandle([]byte(tr.DecMsg), tr.Timestamp, tr.RawMsg[offset:])
} else if tr.IfType == 4 { // UDP
offset = 28
ret = pfcpDataHandle([]byte(tr.DecMsg), tr.Timestamp, tr.RawMsg[offset:])
} else { // HTTP2
iplen := uint16(binary.BigEndian.Uint16(tr.RawMsg[2:]))
tcplen := uint16(iplen - 32 - 20)
hdrlen := uint16(binary.BigEndian.Uint16(tr.RawMsg[20+32+1:]))
offset = 52
if tcplen > (hdrlen + 9) { // has data
doffset := uint16(uint16(offset) + hdrlen + 9)
datlen := uint16(binary.BigEndian.Uint16(tr.RawMsg[doffset+1:]))
log.Debugf("HTTP datlen %d\n", datlen)
ret = httpHeaderDataHandle([]byte(tr.DecMsg), tr.RawMsg[offset+9:offset+9+int(hdrlen)], tr.RawMsg[doffset+9:doffset+datlen+9])
} else {
ret = httpHeaderDataHandle([]byte(tr.DecMsg), tr.RawMsg[offset+9:hdrlen], nil)
}
}
if ret == 0 {
_, err := dborm.XormInsertTraceData(tr)
if err != nil {
log.Error("Failed to dborm.XormInsertTraceData:", err)
return err
}
}
return nil
}
// ////////////////
// var rdb *redis.Client
// var redisOn bool
// var rurl string
//
// func RdbInitClient(Url string) (err error) {
// rurl = Url
// rdb = redis.NewClient(&redis.Options{
// Addr: rurl,
// Password: "", // no password set
// DB: 0, // use default
// })
//
// ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
// defer cancel()
//
// _, err = rdb.Ping(ctx).Result()
// if err != nil {
// log.Debugf("db connect failed\n")
// return err
// }
// return nil
// }
//
// func RdbKeys(filter string) (vals []string, err error) {
// ctx := context.Background()
//
// vals, err = rdb.Keys(ctx, filter).Result()
//
// if err != nil {
// log.Error("db: Keys ", err.Error())
// return nil, err
// }
//
// return vals, nil
// }
//
// func RdbHGetAll(key string) (kvs map[string]string, err error) {
// ctx := context.Background()
// kvs, err = rdb.HGetAll(ctx, key).Result()
//
// if err != nil {
// log.Error("db: HGetAll ", err.Error())
// return nil, err
// }
//
// return kvs, nil
// }
//
// func RdbHMSet(key string, kvs map[string]interface{}) (err error) {
// ctx := context.Background()
// err = rdb.HMSet(ctx, key, kvs).Err()
//
// if err != nil {
// log.Error("db: HMSet ", err.Error())
// return err
// }
//
// return nil
// }
//
// func RdbDel(key string) (err error) {
// ctx := context.Background()
// err = rdb.Del(ctx, key).Err()
//
// if err != nil {
// log.Error("db: Del ", err.Error())
// return err
// }
//
// return nil
// }
//
// func rdbClient(url string) {
// var err error
// var kvs map[string]string
// var vals []string
// var tr TraceRecord
//
// err = RdbInitClient(url)
//
// if err != nil {
// log.Debugf("db: RdbInitClient err\n")
// os.Exit(2)
// }
//
// for {
// vals, err = RdbKeys("tsk*") // (vals []string, err error)
// if err == nil {
// for i := range vals {
// kvs, err = RdbHGetAll(vals[i]) //(kvs map[string]string, err error)
// if err == nil {
// //tsk-1:1682764180993584177:460000100000001:8
// log.Debugf("%d: %s %s %s %v\n", i, vals[i], kvs["srcip"], kvs["dstip"], []byte(kvs["ipdat"]))
// arr := strings.Split(vals[i], ":")
// if arr != nil && len(arr) == 4 {
// tr.Taskid, _ = strconv.Atoi(arr[0][4:])
// tr.Timestamp, _ = strconv.ParseInt(arr[1], 10, 64)
//
// tr.Imsi = arr[2]
// tr.IfType, _ = strconv.Atoi(arr[3])
//
// }
// tr.SrcAddr = fmt.Sprintf("%s:d", kvs["srcip"], kvs["srcport"])
// tr.DstAddr = fmt.Sprintf("%s:d", kvs["dstip"], kvs["dstport"])
// tr.MsgType, _ = strconv.Atoi(kvs["msgtp"])
// tr.MsgDirect, _ = strconv.Atoi(kvs["direct"])
// rawlen, _ := strconv.Atoi(kvs["datlen"])
// tr.RawMsg = make([]byte, rawlen)
// copy(tr.RawMsg, []byte(kvs["ipdat"]))
// //tr.DecodedMsg
// PutTraceRecordToDB(&tr)
//
// //RdbDel(vals[i])
// }
//
// }
// }
// time.Sleep(time.Second * 5)
// }
// }
// DataBase Connnection
//func QueryMultiRowDemo() {
// //InitMysql()
// sqlStr := "SELECT id,sname,age FROM student WHERE id = ?"
// rows, err := dbc.Query(sqlStr, 1)
// if err != nil {
// log.Debugf("query failed, err:%v\n", err)
// return
// }
// // 非常重要关闭rows释放持有的数据库链接
// defer rows.Close()
//
// // 循环读取结果集中的数据
// for rows.Next() {
// var u User
// err := rows.Scan(&u.id, &u.name, &u.age)
// if err != nil {
// log.Debugf("scan failed, err:%v\n", err)
// return
// }
// //log.Debugf("id:%d name:%s age:%d\n", u.id, u.name, u.age)
// }
//}
func ToHtml(path string, timestamp string, port string, ipDaTA []byte) {
log.Trace("byte数据:", ipDaTA)
encodedStr := hex.EncodeToString(ipDaTA)
// [72 101 108 108 111]
log.Trace(encodedStr)
command := fmt.Sprintf("/usr/local/bin/ipdata2html -f %s -t %s -i %s -d %s", path, timestamp, port, encodedStr)
log.Trace("commm:", command)
cmd := exec.Command("sh", "-c", command)
_, err := cmd.CombinedOutput()
if err != nil {
log.Error("Error:can not obtain stdout pipe for command:", err)
return
}
//执行命令
}
func main() {
conf := config.GetYamlConfig()
log.InitLogger(conf.Logger.File, conf.Logger.Duration, conf.Logger.Count, "omc:captrace", config.GetLogLevel())
log.Debugf("OMC captrace version: %s\n", global.Version)
log.Infof("========================= OMC captrace startup =========================")
log.Infof("OMC captrace version: %s %s %s", global.Version, global.BuildTime, global.GoVer)
err := dborm.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
conf.Database.Host, conf.Database.Port, conf.Database.Name)
if err != nil {
fmt.Println("dborm.initDbClient err:", err)
os.Exit(2)
}
var wg sync.WaitGroup
wg.Add(1)
udpServer(conf.Gtp.Addr)
wg.Wait()
}

112
captrace/config/config.go Normal file
View File

@@ -0,0 +1,112 @@
package config
import (
"flag"
"fmt"
"os"
"strings"
"ems.agt/lib/global"
"ems.agt/lib/log"
"gopkg.in/yaml.v3"
)
// Yaml struct of config
type YamlConfig struct {
Logger struct {
File string `yaml:"file"`
Level string `yaml:"level"`
Duration int `yaml:"duration"`
Count int `yaml:"count"`
} `yaml:"logger"`
Gtp struct {
Addr string `yaml:"addr"`
} `yaml:"gtp"`
Database struct {
Type string `yaml:"type"`
User string `yaml:"user"`
Password string `yaml:"password"`
Host string `yaml:"host"`
Port string `yaml:"port"`
Name string `yaml:"name"`
} `yaml:"database"`
}
var YamlConf YamlConfig
func ReadConfig(configFile string) {
yamlFile, err := os.ReadFile(configFile)
if err != nil {
fmt.Println("Read yaml config file error:", err)
os.Exit(2)
}
// fmt.Println("yamlfile:", string(yamlFile))
err = yaml.Unmarshal(yamlFile, &YamlConf)
if err != nil {
fmt.Println("Unmarshal error:", err)
os.Exit(3)
}
}
func WriteYamlConfig(newConfigData YamlConfig, configFile string) {
// 将配置转换回YAML数据
newYamlData, err := yaml.Marshal(&newConfigData)
if err != nil {
log.Errorf("Failed to marshal YAML: %v", err)
}
// 将新的YAML数据写入文件
err = os.WriteFile(configFile, newYamlData, 0644)
if err != nil {
log.Errorf("Failed to write YAML file: %v", err)
}
}
func GetYamlConfig() *YamlConfig {
return &YamlConf
}
func GetLogLevel() log.LogLevel {
var logLevel log.LogLevel
switch strings.ToLower(YamlConf.Logger.Level) {
case "trace":
logLevel = log.LOG_TRACE
case "info":
logLevel = log.LOG_INFO
case "debug":
logLevel = log.LOG_DEBUG
case "warn":
logLevel = log.LOG_WARN
case "error":
logLevel = log.LOG_ERROR
case "fatal":
logLevel = log.LOG_FATAL
case "off":
logLevel = log.LOG_OFF
default:
logLevel = log.LOG_DEBUG
}
return logLevel
}
const defaultConfigFile = "./etc/capconf.yaml"
func init() {
cfile := flag.String("c", defaultConfigFile, "config file")
pv := flag.Bool("version", false, "print version")
ph := flag.Bool("help", false, "print help")
flag.Parse()
if *pv {
fmt.Printf("OMC captrace version: %s\n%s\n%s\n\n", global.Version, global.BuildTime, global.GoVer)
os.Exit(0)
}
if *ph {
flag.Usage()
os.Exit(0)
}
ReadConfig(*cfile)
}

21
captrace/etc/capconf.yaml Normal file
View File

@@ -0,0 +1,21 @@
# file: log file name
# level: /trace/debug/info/error/warn/error/fatal, default: debug
# duration: saved days, default is 30 days
logger:
file: d:/local.git/ems.agt/captrace/log/captrace.log
level: trace
duration: 24
count: 10
gtp:
addr: :2152
database:
type: mysql
user: root
password: 1000omc@kp!
host: 172.25.97.150
port: 33066
name: omc_db

26
captrace/makefile Normal file
View File

@@ -0,0 +1,26 @@
# Makefile for rest agent project
PROJECT = OMC
VERSION = 1.0.0
PLATFORM = amd64
ARMPLATFORM = aarch64
BUILDDIR = ../../build
DEBBUILDDIR = ../../debbuild
RPMBUILDDIR = $(HOME)/goprojects/rpmbuild
INSTALLDIR = /usr/local/omc
RELEASEDIR = ../../release
LIBDIR = ems.agt/lib
BINNAME = captrace
.PHONY: build $(BINNAME)
build $(BINNAME):
go build -o $(BINNAME) -v -ldflags "-X '$(LIBDIR)/global.Version=$(VERSION)' \
-X '$(LIBDIR)/global.BuildTime=`date`' \
-X '$(LIBDIR)/global.GoVer=`go version`'"
run: $(BINNAME)
./$(BINNAME)
clean:
rm ./$(BINNAME)

View File

@@ -1,7 +1,7 @@
# Makefile for OMC-OMC-crontask project
PROJECT = OMC
VERSION = 16.1.1
VERSION = 1.0.0
LIBDIR = ems.agt/lib
BINNAME = crontask

View File

@@ -1729,7 +1729,7 @@ func XormGetNorthboundCmLatestObject(neType, neID, objectType string) (*Northbou
}
type TraceData struct {
ID int `json:"id" xorm:"pk 'id' autoincr"`
ID int `json:"-" xorm:"pk '-' autoincr"`
TaskID int `json:"taskID" xorm:"task_id"`
Imsi string `json:"imsi" xorm:"imsi"`
Msisdn string `json:"msisdn" xorm:"msisdn"`
@@ -1768,6 +1768,29 @@ func XormUpdateTraceData(id int, data *TraceData) (int64, error) {
return affected, nil
}
func XormInsertTraceData(data *TraceData) (int64, error) {
affected, err := xEngine.Table("trace_data").
InsertOne(data)
if err != nil {
log.Error("Failed to insert table trace_data:", err)
return 0, err
}
return affected, nil
}
func XormDeleteTraceData(id int) (int64, error) {
affected, err := xEngine.Table("trace_data").
Where("id=?", id).
Delete()
if err != nil {
log.Error("Failed to delete table trace_data:", err)
return 0, err
}
return affected, nil
}
func XormGetTraceRawMsg(id int) (int64, []byte, error) {
var rawMsg []byte
var timestamp int64

View File

@@ -19,12 +19,14 @@ LibDir = $(EmsBEDir)/lib
RESTAGENT = restagent
CRONTASK = crontask
SshSvcBin = sshsvc
CapTraceBin = captrace
NBI_ALARM = nbi_alarm
NBI_AGENT = nbi_agent
4A_AGENT = 4a_agent
RestagentDir = $(EmsBEDir)/$(RESTAGENT)
CrontaskDir = $(EmsBEDir)/$(CRONTASK)
SshSvcDir = $(EmsBEDir)/$(SshSvcBin)
CapTraceDir = $(EmsBEDir)/$(CapTraceBin)
DBSQLSrcDir = $(EmsBEDir)/database
MiscDir = $(EmsBEDir)/misc
FrontBuildDir = $(BuildDir)/omc/htdocs
@@ -36,8 +38,8 @@ CrontaskSize = 27788951
RestagentSize = 29525312
BinWriterDir = $(HOME)/bin
.PHONY: all $(RESTAGENT) $(CRONTASK)
all: $(RESTAGENT) $(CRONTASK)
.PHONY: all $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin)
all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin)
cd $(RestagentDir)
go build -o $(RESTAGENT) -v -ldflags "-X 'ems.agt/lib/conifg.Version=$(VERSION)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \
@@ -46,10 +48,17 @@ all: $(RESTAGENT) $(CRONTASK)
go build -o $(CRONTASK) -v -ldflags "-X '$(LibDir)/conifg.Version=$(VERSION)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LibDir)/conifg.GoVer=`go version`'"
cd $(SshSvcDir)
go build -o $(SshSvcBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(VERSION)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LibDir)/conifg.GoVer=`go version`'"
cd $(CapTraceDir)
go build -o $(CapTraceBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(VERSION)' \
-X '$(LibDir)/conifg.BuildTime=`date`' \
-X '$(LibDir)/conifg.GoVer=`go version`'"
clean:
rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK)
rm ./restagent/$(RESTAGENT) ./crontask/$(CRONTASK) $(SshSvcDir)/$(SshSvcBin) $(CapTraceDir)/$(CapTraceBin)
dist:
tar -zvcPf $(ReleaseDir)/$(PROJECT)-src-$(VERSION).tar.gz \
@@ -69,6 +78,7 @@ deb: $(BINNAME)
cp -rf ./restagent/$(RESTAGENT) $(BinDir)
cp -rf ./crontask/$(CRONTASK) $(BinDir)
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir)
cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir)
cp -rf $(MiscDir)/* $(BinDir)
cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/
cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/
@@ -88,6 +98,7 @@ rpm: $(BINNAME)
cp -rf ./restagent/$(RESTAGENT) $(BinDir)
cp -rf ./crontask/$(CRONTASK) $(BinDir)
cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir)
cp -rf $(CapTraceDir)/$(CapTraceBin) $(BinDir)
# $(BinWriterDir)/binWriter $(BinDir)/$(RESTAGENT) $(RestagentSize)
# $(BinWriterDir)/binWriter $(BinDir)/$(CRONTASK) $(CrontaskSize)
# cp -rf $(MiscDir)/ne-hosts $(BinDir)

View File

@@ -1,7 +1,7 @@
# Makefile for rest agent project
PROJECT = OMC
VERSION = 16.1.1
VERSION = 1.0.0
PLATFORM = amd64
ARMPLATFORM = aarch64
BUILDDIR = ../../build