Skip to content

Only attempt SSH upload on Yun boards #100

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

Closed
wants to merge 2 commits into from
Closed

Only attempt SSH upload on Yun boards #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34abb68
Only attempt SSH upload on "arduino:avr:yun" boards
sandeepmistry May 13, 2016
f9da80c
Use array to track allowed SSH boards
sandeepmistry May 16, 2016
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
11 changes: 9 additions & 2 deletions programmer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"path/filepath"
"regexp"
"runtime"
"sort"
"strconv"
"strings"
"time"
Expand All @@ -25,12 +26,18 @@ import (
)

var compiling = false
var allowedSshBoards = []string{"arduino:avr:yun"}

func colonToUnderscore(input string) string {
output := strings.Replace(input, ":", "_", -1)
return output
}

func sshProgramAllowed(boardname string) bool {
sort.Strings(allowedSshBoards)
return sort.SearchStrings(allowedSshBoards, boardname) != len(allowedSshBoards)
}

type basicAuthData struct {
Username string `json:"username"`
Password string `json:"password"`
Expand Down Expand Up @@ -267,8 +274,8 @@ func spProgramRW(portname string, boardname string, filePath string, commandline

if extraInfo.Network {
err = spProgramNetwork(portname, boardname, filePath, extraInfo.Auth)
if err != nil {
// no http method available, try ssh upload
if err != nil && sshProgramAllowed(boardname) {
// http method failed, try ssh upload if allowed
err = spProgramSSHNetwork(portname, boardname, filePath, commandline, extraInfo.Auth)
}
} else {
Expand Down